diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-09 22:41:59 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-15 20:23:16 -0400 |
commit | ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (patch) | |
tree | 6c2400cff6bd26c8bfb06bd523b227a0e3aa232e /drivers/net/Space.c | |
parent | 211ed865108e24697b44bee5daac502ee6bdd4a4 (diff) |
tokenring: delete all remaining driver support
This represents the mass deletion of the of the tokenring support.
It gets rid of:
- the net/tr.c which the drivers depended on
- the drivers/net component
- the Kbuild infrastructure around it
- any tokenring related CONFIG_ settings in any defconfigs
- the tokenring headers in the include/linux dir
- the firmware associated with the tokenring drivers.
- any associated token ring documentation.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/net/Space.c')
-rw-r--r-- | drivers/net/Space.c | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/drivers/net/Space.c b/drivers/net/Space.c index 88bbd8ffa7fe..486e2dc366e0 100644 --- a/drivers/net/Space.c +++ b/drivers/net/Space.c | |||
@@ -29,7 +29,6 @@ | |||
29 | */ | 29 | */ |
30 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
31 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
32 | #include <linux/trdevice.h> | ||
33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
35 | #include <linux/netlink.h> | 34 | #include <linux/netlink.h> |
@@ -284,46 +283,6 @@ static void __init ethif_probe2(int unit) | |||
284 | probe_list2(unit, parport_probes, base_addr == 0)); | 283 | probe_list2(unit, parport_probes, base_addr == 0)); |
285 | } | 284 | } |
286 | 285 | ||
287 | #ifdef CONFIG_TR | ||
288 | /* Token-ring device probe */ | ||
289 | extern int ibmtr_probe_card(struct net_device *); | ||
290 | extern struct net_device *smctr_probe(int unit); | ||
291 | |||
292 | static struct devprobe2 tr_probes2[] __initdata = { | ||
293 | #ifdef CONFIG_SMCTR | ||
294 | {smctr_probe, 0}, | ||
295 | #endif | ||
296 | {NULL, 0}, | ||
297 | }; | ||
298 | |||
299 | static __init int trif_probe(int unit) | ||
300 | { | ||
301 | int err = -ENODEV; | ||
302 | #ifdef CONFIG_IBMTR | ||
303 | struct net_device *dev = alloc_trdev(0); | ||
304 | if (!dev) | ||
305 | return -ENOMEM; | ||
306 | |||
307 | sprintf(dev->name, "tr%d", unit); | ||
308 | netdev_boot_setup_check(dev); | ||
309 | err = ibmtr_probe_card(dev); | ||
310 | if (err) | ||
311 | free_netdev(dev); | ||
312 | #endif | ||
313 | return err; | ||
314 | } | ||
315 | |||
316 | static void __init trif_probe2(int unit) | ||
317 | { | ||
318 | unsigned long base_addr = netdev_boot_base("tr", unit); | ||
319 | |||
320 | if (base_addr == 1) | ||
321 | return; | ||
322 | probe_list2(unit, tr_probes2, base_addr == 0); | ||
323 | } | ||
324 | #endif | ||
325 | |||
326 | |||
327 | /* Statically configured drivers -- order matters here. */ | 286 | /* Statically configured drivers -- order matters here. */ |
328 | static int __init net_olddevs_init(void) | 287 | static int __init net_olddevs_init(void) |
329 | { | 288 | { |
@@ -333,11 +292,6 @@ static int __init net_olddevs_init(void) | |||
333 | for (num = 0; num < 8; ++num) | 292 | for (num = 0; num < 8; ++num) |
334 | sbni_probe(num); | 293 | sbni_probe(num); |
335 | #endif | 294 | #endif |
336 | #ifdef CONFIG_TR | ||
337 | for (num = 0; num < 8; ++num) | ||
338 | if (!trif_probe(num)) | ||
339 | trif_probe2(num); | ||
340 | #endif | ||
341 | for (num = 0; num < 8; ++num) | 295 | for (num = 0; num < 8; ++num) |
342 | ethif_probe2(num); | 296 | ethif_probe2(num); |
343 | 297 | ||