drivers/net: delete all code/drivers depending on CONFIG_MCA (a5e371f6) · Commits · 戴 / test

Documentation/networking/3c509.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ models:
		3c509B (later revision of the ISA card; supports full-duplex)
		3c589 (PCMCIA)
		3c589B (later revision of the 3c589; supports full-duplex)
		3c529 (MCA)
		3c579 (EISA)

		Large portions of this documentation were heavily borrowed from the guide

Documentation/networking/fore200e.txt

+2 −4

Original line number	Diff line number	Diff line
		@@ -11,12 +11,10 @@ i386, alpha (untested), powerpc, sparc and sparc64 archs.

		The intent is to enable the use of different models of FORE adapters at the
		same time, by hosts that have several bus interfaces (such as PCI+SBUS,
		PCI+MCA or PCI+EISA).
		or PCI+EISA).

		Only PCI and SBUS devices are currently supported by the driver, but support
		for other bus interfaces such as EISA should not be too hard to add (this may
		be more tricky for the MCA bus, though, as FORE made some MCA-specific
		modifications to the adapter's AALI interface).
		for other bus interfaces such as EISA should not be too hard to add.


		Firmware Copyright Notice

drivers/net/Space.c

+1 −15

Original line number	Diff line number	Diff line
		@@ -133,22 +133,9 @@ static struct devprobe2 eisa_probes[] __initdata = {
		{NULL, 0},
		};

		static struct devprobe2 mca_probes[] __initdata = {
		#ifdef CONFIG_NE2_MCA
		{ne2_probe, 0},
		#endif
		#ifdef CONFIG_ELMC /* 3c523 */
		{elmc_probe, 0},
		#endif
		#ifdef CONFIG_ELMC_II /* 3c527 */
		{mc32_probe, 0},
		#endif
		{NULL, 0},
		};

		/*
		* ISA probes that touch addresses < 0x400 (including those that also
		* look for EISA/PCI/MCA cards in addition to ISA cards).
		* look for EISA/PCI cards in addition to ISA cards).
		*/
		static struct devprobe2 isa_probes[] __initdata = {
		#if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */
		@@ -278,7 +265,6 @@ static void __init ethif_probe2(int unit)

		(void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
		probe_list2(unit, eisa_probes, base_addr == 0) &&
		probe_list2(unit, mca_probes, base_addr == 0) &&
		probe_list2(unit, isa_probes, base_addr == 0) &&
		probe_list2(unit, parport_probes, base_addr == 0));
		}

drivers/net/ethernet/3com/3c509.c

+2 −121

Original line number	Diff line number	Diff line
		@@ -69,7 +69,6 @@
		#define TX_TIMEOUT (400*HZ/1000)

		#include <linux/module.h>
		#include <linux/mca.h>
		#include <linux/isa.h>
		#include <linux/pnp.h>
		#include <linux/string.h>
		@@ -102,7 +101,7 @@ static int el3_debug = 2;
		#endif

		/* Used to do a global count of all the cards in the system. Must be
		* a global variable so that the mca/eisa probe routines can increment
		* a global variable so that the eisa probe routines can increment
		* it */
		static int el3_cards = 0;
		#define EL3_MAX_CARDS 8
		@@ -163,7 +162,7 @@ enum RxFilter {
		*/
		#define SKB_QUEUE_SIZE 64

		enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA };
		enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_EISA };

		struct el3_private {
		spinlock_t lock;
		@@ -505,41 +504,6 @@ static struct eisa_driver el3_eisa_driver = {
		static int eisa_registered;
		#endif

		#ifdef CONFIG_MCA
		static int el3_mca_probe(struct device *dev);

		static short el3_mca_adapter_ids[] __initdata = {
		0x627c,
		0x627d,
		0x62db,
		0x62f6,
		0x62f7,
		0x0000
		};

		static char *el3_mca_adapter_names[] __initdata = {
		"3Com 3c529 EtherLink III (10base2)",
		"3Com 3c529 EtherLink III (10baseT)",
		"3Com 3c529 EtherLink III (test mode)",
		"3Com 3c529 EtherLink III (TP or coax)",
		"3Com 3c529 EtherLink III (TP)",
		NULL
		};

		static struct mca_driver el3_mca_driver = {
		.id_table = el3_mca_adapter_ids,
		.driver = {
		.name = "3c529",
		.bus = &mca_bus_type,
		.probe = el3_mca_probe,
		.remove = __devexit_p(el3_device_remove),
		.suspend = el3_suspend,
		.resume = el3_resume,
		},
		};
		static int mca_registered;
		#endif /* CONFIG_MCA */

		static const struct net_device_ops netdev_ops = {
		.ndo_open = el3_open,
		.ndo_stop = el3_close,
		@@ -600,76 +564,6 @@ static void el3_common_remove (struct net_device *dev)
		free_netdev (dev);
		}

		#ifdef CONFIG_MCA
		static int __init el3_mca_probe(struct device *device)
		{
		/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
		* heavily modified by Chris Beauregard
		* (cpbeaure@csclub.uwaterloo.ca) to support standard MCA
		* probing.
		*
		* redone for multi-card detection by ZP Gu (zpg@castle.net)
		* now works as a module */

		short i;
		int ioaddr, irq, if_port;
		__be16 phys_addr[3];
		struct net_device *dev = NULL;
		u_char pos4, pos5;
		struct mca_device *mdev = to_mca_device(device);
		int slot = mdev->slot;
		int err;

		pos4 = mca_device_read_stored_pos(mdev, 4);
		pos5 = mca_device_read_stored_pos(mdev, 5);

		ioaddr = ((short)((pos4&0xfc)\|0x02)) << 8;
		irq = pos5 & 0x0f;


		pr_info("3c529: found %s at slot %d\n",
		el3_mca_adapter_names[mdev->index], slot + 1);

		/* claim the slot */
		strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
		sizeof(mdev->name));
		mca_device_set_claim(mdev, 1);

		if_port = pos4 & 0x03;

		irq = mca_device_transform_irq(mdev, irq);
		ioaddr = mca_device_transform_ioport(mdev, ioaddr);
		if (el3_debug > 2) {
		pr_debug("3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port);
		}
		EL3WINDOW(0);
		for (i = 0; i < 3; i++)
		phys_addr[i] = htons(read_eeprom(ioaddr, i));

		dev = alloc_etherdev(sizeof (struct el3_private));
		if (dev == NULL) {
		release_region(ioaddr, EL3_IO_EXTENT);
		return -ENOMEM;
		}

		netdev_boot_setup_check(dev);

		el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);
		dev_set_drvdata(device, dev);
		err = el3_common_init(dev);

		if (err) {
		dev_set_drvdata(device, NULL);
		free_netdev(dev);
		return -ENOMEM;
		}

		el3_devs[el3_cards++] = dev;
		return 0;
		}

		#endif /* CONFIG_MCA */

		#ifdef CONFIG_EISA
		static int __init el3_eisa_probe (struct device *device)
		{
		@@ -1547,11 +1441,6 @@ static int __init el3_init_module(void)
		if (!ret)
		eisa_registered = 1;
		#endif
		#ifdef CONFIG_MCA
		ret = mca_register_driver(&el3_mca_driver);
		if (!ret)
		mca_registered = 1;
		#endif

		#ifdef CONFIG_PNP
		if (pnp_registered)
		@@ -1562,10 +1451,6 @@ static int __init el3_init_module(void)
		#ifdef CONFIG_EISA
		if (eisa_registered)
		ret = 0;
		#endif
		#ifdef CONFIG_MCA
		if (mca_registered)
		ret = 0;
		#endif
		return ret;
		}
		@@ -1584,10 +1469,6 @@ static void __exit el3_cleanup_module(void)
		if (eisa_registered)
		eisa_driver_unregister(&el3_eisa_driver);
		#endif
		#ifdef CONFIG_MCA
		if (mca_registered)
		mca_unregister_driver(&el3_mca_driver);
		#endif
		}

		module_init (el3_init_module);

drivers/net/ethernet/8390/Kconfig

+0 −24

Original line number	Diff line number	Diff line
		@@ -182,18 +182,6 @@ config NE2000
		To compile this driver as a module, choose M here. The module
		will be called ne.

		config NE2_MCA
		tristate "NE/2 (ne2000 MCA version) support"
		depends on MCA_LEGACY
		select CRC32
		---help---
		If you have a network (Ethernet) card of this type, say Y and read
		the Ethernet-HOWTO, available from
		<http://www.tldp.org/docs.html#howto>.

		To compile this driver as a module, choose M here. The module
		will be called ne2.

		config NE2K_PCI
		tristate "PCI NE2000 and clones support (see help)"
		depends on PCI
		@@ -267,18 +255,6 @@ config STNIC

		If unsure, say N.

		config ULTRAMCA
		tristate "SMC Ultra MCA support"
		depends on MCA
		select CRC32
		---help---
		If you have a network (Ethernet) card of this type and are running
		an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
		available from <http://www.tldp.org/docs.html#howto>.

		To compile this driver as a module, choose M here. The module
		will be called smc-mca.

		config ULTRA
		tristate "SMC Ultra support"
		depends on ISA

Admin message