aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/Space.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2013-01-13 13:55:05 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-14 13:21:57 -0500
commita66f566afc3a06f7588cd7a2c93125fce494162b (patch)
treef29713764cc51631f6fa2a8a5641f11a5e95d90f /drivers/net/Space.c
parent38675170e4235f859bb85564c33ffa077a1c1ef7 (diff)
drivers/net: Clean up orphaned probes in Space.c
The removal of the 8390 EISA drivers actually comprises the complete content of the EISA probe block, so we can now remove that block, and its hook into the unified probe. Note that the deleted comment mentions PCI probes, but they long since moved elsewhere, so no PCI probes are touched here. We get rid of the orphaned EISA probe prototypes, and a couple of left over MCA probe prototypes at the same time. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r--drivers/net/Space.c31
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index e3f0faca98d0..5637c2671415 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -37,10 +37,8 @@
37 ethernet adaptor have the name "eth[0123...]". 37 ethernet adaptor have the name "eth[0123...]".
38 */ 38 */
39 39
40extern struct net_device *ne2_probe(int unit);
41extern struct net_device *hp100_probe(int unit); 40extern struct net_device *hp100_probe(int unit);
42extern struct net_device *ultra_probe(int unit); 41extern struct net_device *ultra_probe(int unit);
43extern struct net_device *ultra32_probe(int unit);
44extern struct net_device *wd_probe(int unit); 42extern struct net_device *wd_probe(int unit);
45extern struct net_device *el2_probe(int unit); 43extern struct net_device *el2_probe(int unit);
46extern struct net_device *ne_probe(int unit); 44extern struct net_device *ne_probe(int unit);
@@ -55,11 +53,7 @@ extern struct net_device *i82596_probe(int unit);
55extern struct net_device *ewrk3_probe(int unit); 53extern struct net_device *ewrk3_probe(int unit);
56extern struct net_device *el1_probe(int unit); 54extern struct net_device *el1_probe(int unit);
57extern struct net_device *el16_probe(int unit); 55extern struct net_device *el16_probe(int unit);
58extern struct net_device *elmc_probe(int unit);
59extern struct net_device *elplus_probe(int unit); 56extern struct net_device *elplus_probe(int unit);
60extern struct net_device *ac3200_probe(int unit);
61extern struct net_device *es_probe(int unit);
62extern struct net_device *lne390_probe(int unit);
63extern struct net_device *e2100_probe(int unit); 57extern struct net_device *e2100_probe(int unit);
64extern struct net_device *ni5010_probe(int unit); 58extern struct net_device *ni5010_probe(int unit);
65extern struct net_device *ni52_probe(int unit); 59extern struct net_device *ni52_probe(int unit);
@@ -77,7 +71,6 @@ extern struct net_device *tc515_probe(int unit);
77extern struct net_device *lance_probe(int unit); 71extern struct net_device *lance_probe(int unit);
78extern struct net_device *mac8390_probe(int unit); 72extern struct net_device *mac8390_probe(int unit);
79extern struct net_device *mac89x0_probe(int unit); 73extern struct net_device *mac89x0_probe(int unit);
80extern struct net_device *mc32_probe(int unit);
81extern struct net_device *cops_probe(int unit); 74extern struct net_device *cops_probe(int unit);
82extern struct net_device *ltpc_probe(void); 75extern struct net_device *ltpc_probe(void);
83 76
@@ -111,29 +104,6 @@ static int __init probe_list2(int unit, struct devprobe2 *p, int autoprobe)
111} 104}
112 105
113/* 106/*
114 * This is a bit of an artificial separation as there are PCI drivers
115 * that also probe for EISA cards (in the PCI group) and there are ISA
116 * drivers that probe for EISA cards (in the ISA group). These are the
117 * legacy EISA only driver probes, and also the legacy PCI probes
118 */
119
120static struct devprobe2 eisa_probes[] __initdata = {
121#ifdef CONFIG_ULTRA32
122 {ultra32_probe, 0},
123#endif
124#ifdef CONFIG_AC3200
125 {ac3200_probe, 0},
126#endif
127#ifdef CONFIG_ES3210
128 {es_probe, 0},
129#endif
130#ifdef CONFIG_LNE390
131 {lne390_probe, 0},
132#endif
133 {NULL, 0},
134};
135
136/*
137 * ISA probes that touch addresses < 0x400 (including those that also 107 * ISA probes that touch addresses < 0x400 (including those that also
138 * look for EISA/PCI cards in addition to ISA cards). 108 * look for EISA/PCI cards in addition to ISA cards).
139 */ 109 */
@@ -264,7 +234,6 @@ static void __init ethif_probe2(int unit)
264 return; 234 return;
265 235
266 (void)( probe_list2(unit, m68k_probes, base_addr == 0) && 236 (void)( probe_list2(unit, m68k_probes, base_addr == 0) &&
267 probe_list2(unit, eisa_probes, base_addr == 0) &&
268 probe_list2(unit, isa_probes, base_addr == 0) && 237 probe_list2(unit, isa_probes, base_addr == 0) &&
269 probe_list2(unit, parport_probes, base_addr == 0)); 238 probe_list2(unit, parport_probes, base_addr == 0));
270} 239}