Skip to content

Commit a5e371f

Browse files
author
Paul Gortmaker
committed
drivers/net: delete all code/drivers depending on CONFIG_MCA
The support for CONFIG_MCA is being removed, since the 20 year old hardware simply isn't capable of meeting today's software demands on CPU and memory resources. This commit removes any MCA specific net drivers, and removes any MCA specific probe/support code from drivers that were doing a dual ISA/MCA role. Cc: "David S. Miller" <davem@davemloft.net> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: netdev@vger.kernel.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
1 parent bc6a474 commit a5e371f

File tree

19 files changed

+18
-5369
lines changed

19 files changed

+18
-5369
lines changed

‎Documentation/networking/3c509.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ models:
2525
3c509B (later revision of the ISA card; supports full-duplex)
2626
3c589 (PCMCIA)
2727
3c589B (later revision of the 3c589; supports full-duplex)
28-
3c529 (MCA)
2928
3c579 (EISA)
3029

3130
Large portions of this documentation were heavily borrowed from the guide

‎Documentation/networking/fore200e.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,10 @@ i386, alpha (untested), powerpc, sparc and sparc64 archs.
1111

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

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

2119

2220
Firmware Copyright Notice

‎drivers/net/Space.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -133,22 +133,9 @@ static struct devprobe2 eisa_probes[] __initdata = {
133133
{NULL, 0},
134134
};
135135

136-
static struct devprobe2 mca_probes[] __initdata = {
137-
#ifdef CONFIG_NE2_MCA
138-
{ne2_probe, 0},
139-
#endif
140-
#ifdef CONFIG_ELMC /* 3c523 */
141-
{elmc_probe, 0},
142-
#endif
143-
#ifdef CONFIG_ELMC_II /* 3c527 */
144-
{mc32_probe, 0},
145-
#endif
146-
{NULL, 0},
147-
};
148-
149136
/*
150137
* ISA probes that touch addresses < 0x400 (including those that also
151-
* look for EISA/PCI/MCA cards in addition to ISA cards).
138+
* look for EISA/PCI cards in addition to ISA cards).
152139
*/
153140
static struct devprobe2 isa_probes[] __initdata = {
154141
#if defined(CONFIG_HP100) && defined(CONFIG_ISA) /* ISA, EISA */
@@ -278,7 +265,6 @@ static void __init ethif_probe2(int unit)
278265

279266
(void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
280267
probe_list2(unit, eisa_probes, base_addr == 0) &&
281-
probe_list2(unit, mca_probes, base_addr == 0) &&
282268
probe_list2(unit, isa_probes, base_addr == 0) &&
283269
probe_list2(unit, parport_probes, base_addr == 0));
284270
}

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

Lines changed: 2 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
#define TX_TIMEOUT (400*HZ/1000)
7070

7171
#include <linux/module.h>
72-
#include <linux/mca.h>
7372
#include <linux/isa.h>
7473
#include <linux/pnp.h>
7574
#include <linux/string.h>
@@ -102,7 +101,7 @@ static int el3_debug = 2;
102101
#endif
103102

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

166-
enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_MCA, EL3_EISA };
165+
enum el3_cardtype { EL3_ISA, EL3_PNP, EL3_EISA };
167166

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

508-
#ifdef CONFIG_MCA
509-
static int el3_mca_probe(struct device *dev);
510-
511-
static short el3_mca_adapter_ids[] __initdata = {
512-
0x627c,
513-
0x627d,
514-
0x62db,
515-
0x62f6,
516-
0x62f7,
517-
0x0000
518-
};
519-
520-
static char *el3_mca_adapter_names[] __initdata = {
521-
"3Com 3c529 EtherLink III (10base2)",
522-
"3Com 3c529 EtherLink III (10baseT)",
523-
"3Com 3c529 EtherLink III (test mode)",
524-
"3Com 3c529 EtherLink III (TP or coax)",
525-
"3Com 3c529 EtherLink III (TP)",
526-
NULL
527-
};
528-
529-
static struct mca_driver el3_mca_driver = {
530-
.id_table = el3_mca_adapter_ids,
531-
.driver = {
532-
.name = "3c529",
533-
.bus = &mca_bus_type,
534-
.probe = el3_mca_probe,
535-
.remove = __devexit_p(el3_device_remove),
536-
.suspend = el3_suspend,
537-
.resume = el3_resume,
538-
},
539-
};
540-
static int mca_registered;
541-
#endif /* CONFIG_MCA */
542-
543507
static const struct net_device_ops netdev_ops = {
544508
.ndo_open = el3_open,
545509
.ndo_stop = el3_close,
@@ -600,76 +564,6 @@ static void el3_common_remove (struct net_device *dev)
600564
free_netdev (dev);
601565
}
602566

603-
#ifdef CONFIG_MCA
604-
static int __init el3_mca_probe(struct device *device)
605-
{
606-
/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
607-
* heavily modified by Chris Beauregard
608-
* (cpbeaure@csclub.uwaterloo.ca) to support standard MCA
609-
* probing.
610-
*
611-
* redone for multi-card detection by ZP Gu (zpg@castle.net)
612-
* now works as a module */
613-
614-
short i;
615-
int ioaddr, irq, if_port;
616-
__be16 phys_addr[3];
617-
struct net_device *dev = NULL;
618-
u_char pos4, pos5;
619-
struct mca_device *mdev = to_mca_device(device);
620-
int slot = mdev->slot;
621-
int err;
622-
623-
pos4 = mca_device_read_stored_pos(mdev, 4);
624-
pos5 = mca_device_read_stored_pos(mdev, 5);
625-
626-
ioaddr = ((short)((pos4&0xfc)|0x02)) << 8;
627-
irq = pos5 & 0x0f;
628-
629-
630-
pr_info("3c529: found %s at slot %d\n",
631-
el3_mca_adapter_names[mdev->index], slot + 1);
632-
633-
/* claim the slot */
634-
strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
635-
sizeof(mdev->name));
636-
mca_device_set_claim(mdev, 1);
637-
638-
if_port = pos4 & 0x03;
639-
640-
irq = mca_device_transform_irq(mdev, irq);
641-
ioaddr = mca_device_transform_ioport(mdev, ioaddr);
642-
if (el3_debug > 2) {
643-
pr_debug("3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port);
644-
}
645-
EL3WINDOW(0);
646-
for (i = 0; i < 3; i++)
647-
phys_addr[i] = htons(read_eeprom(ioaddr, i));
648-
649-
dev = alloc_etherdev(sizeof (struct el3_private));
650-
if (dev == NULL) {
651-
release_region(ioaddr, EL3_IO_EXTENT);
652-
return -ENOMEM;
653-
}
654-
655-
netdev_boot_setup_check(dev);
656-
657-
el3_dev_fill(dev, phys_addr, ioaddr, irq, if_port, EL3_MCA);
658-
dev_set_drvdata(device, dev);
659-
err = el3_common_init(dev);
660-
661-
if (err) {
662-
dev_set_drvdata(device, NULL);
663-
free_netdev(dev);
664-
return -ENOMEM;
665-
}
666-
667-
el3_devs[el3_cards++] = dev;
668-
return 0;
669-
}
670-
671-
#endif /* CONFIG_MCA */
672-
673567
#ifdef CONFIG_EISA
674568
static int __init el3_eisa_probe (struct device *device)
675569
{
@@ -1547,11 +1441,6 @@ static int __init el3_init_module(void)
15471441
if (!ret)
15481442
eisa_registered = 1;
15491443
#endif
1550-
#ifdef CONFIG_MCA
1551-
ret = mca_register_driver(&el3_mca_driver);
1552-
if (!ret)
1553-
mca_registered = 1;
1554-
#endif
15551444

15561445
#ifdef CONFIG_PNP
15571446
if (pnp_registered)
@@ -1562,10 +1451,6 @@ static int __init el3_init_module(void)
15621451
#ifdef CONFIG_EISA
15631452
if (eisa_registered)
15641453
ret = 0;
1565-
#endif
1566-
#ifdef CONFIG_MCA
1567-
if (mca_registered)
1568-
ret = 0;
15691454
#endif
15701455
return ret;
15711456
}
@@ -1584,10 +1469,6 @@ static void __exit el3_cleanup_module(void)
15841469
if (eisa_registered)
15851470
eisa_driver_unregister(&el3_eisa_driver);
15861471
#endif
1587-
#ifdef CONFIG_MCA
1588-
if (mca_registered)
1589-
mca_unregister_driver(&el3_mca_driver);
1590-
#endif
15911472
}
15921473

15931474
module_init (el3_init_module);

‎drivers/net/ethernet/8390/Kconfig

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -182,18 +182,6 @@ config NE2000
182182
To compile this driver as a module, choose M here. The module
183183
will be called ne.
184184

185-
config NE2_MCA
186-
tristate "NE/2 (ne2000 MCA version) support"
187-
depends on MCA_LEGACY
188-
select CRC32
189-
---help---
190-
If you have a network (Ethernet) card of this type, say Y and read
191-
the Ethernet-HOWTO, available from
192-
<http://www.tldp.org/docs.html#howto>.
193-
194-
To compile this driver as a module, choose M here. The module
195-
will be called ne2.
196-
197185
config NE2K_PCI
198186
tristate "PCI NE2000 and clones support (see help)"
199187
depends on PCI
@@ -267,18 +255,6 @@ config STNIC
267255

268256
If unsure, say N.
269257

270-
config ULTRAMCA
271-
tristate "SMC Ultra MCA support"
272-
depends on MCA
273-
select CRC32
274-
---help---
275-
If you have a network (Ethernet) card of this type and are running
276-
an MCA based system (PS/2), say Y and read the Ethernet-HOWTO,
277-
available from <http://www.tldp.org/docs.html#howto>.
278-
279-
To compile this driver as a module, choose M here. The module
280-
will be called smc-mca.
281-
282258
config ULTRA
283259
tristate "SMC Ultra support"
284260
depends on ISA

‎drivers/net/ethernet/8390/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ obj-$(CONFIG_PCMCIA_PCNET) += pcnet_cs.o 8390.o
2424
obj-$(CONFIG_STNIC) += stnic.o 8390.o
2525
obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o
2626
obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
27-
obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o
2827
obj-$(CONFIG_WD80x3) += wd.o 8390.o
2928
obj-$(CONFIG_ZORRO8390) += zorro8390.o 8390.o

0 commit comments

Comments
 (0)