diff options
| -rw-r--r-- | drivers/net/tokenring/ibmtr.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c index 0d97e10ccac5..36202e94ee91 100644 --- a/drivers/net/tokenring/ibmtr.c +++ b/drivers/net/tokenring/ibmtr.c | |||
| @@ -186,7 +186,6 @@ static char __devinit *adapter_def(char type) | |||
| 186 | #define TRC_INITV 0x02 /* verbose init trace points */ | 186 | #define TRC_INITV 0x02 /* verbose init trace points */ |
| 187 | static unsigned char ibmtr_debug_trace = 0; | 187 | static unsigned char ibmtr_debug_trace = 0; |
| 188 | 188 | ||
| 189 | static int ibmtr_probe(struct net_device *dev); | ||
| 190 | static int ibmtr_probe1(struct net_device *dev, int ioaddr); | 189 | static int ibmtr_probe1(struct net_device *dev, int ioaddr); |
| 191 | static unsigned char get_sram_size(struct tok_info *adapt_info); | 190 | static unsigned char get_sram_size(struct tok_info *adapt_info); |
| 192 | static int trdev_init(struct net_device *dev); | 191 | static int trdev_init(struct net_device *dev); |
| @@ -335,17 +334,6 @@ static void ibmtr_cleanup_card(struct net_device *dev) | |||
| 335 | #endif | 334 | #endif |
| 336 | } | 335 | } |
| 337 | 336 | ||
| 338 | int ibmtr_probe_card(struct net_device *dev) | ||
| 339 | { | ||
| 340 | int err = ibmtr_probe(dev); | ||
| 341 | if (!err) { | ||
| 342 | err = register_netdev(dev); | ||
| 343 | if (err) | ||
| 344 | ibmtr_cleanup_card(dev); | ||
| 345 | } | ||
| 346 | return err; | ||
| 347 | } | ||
| 348 | |||
| 349 | /**************************************************************************** | 337 | /**************************************************************************** |
| 350 | * ibmtr_probe(): Routine specified in the network device structure | 338 | * ibmtr_probe(): Routine specified in the network device structure |
| 351 | * to probe for an IBM Token Ring Adapter. Routine outline: | 339 | * to probe for an IBM Token Ring Adapter. Routine outline: |
| @@ -358,7 +346,7 @@ int ibmtr_probe_card(struct net_device *dev) | |||
| 358 | * which references it. | 346 | * which references it. |
| 359 | ****************************************************************************/ | 347 | ****************************************************************************/ |
| 360 | 348 | ||
| 361 | static int ibmtr_probe(struct net_device *dev) | 349 | static int __init ibmtr_probe(struct net_device *dev) |
| 362 | { | 350 | { |
| 363 | int i; | 351 | int i; |
| 364 | int base_addr = dev->base_addr; | 352 | int base_addr = dev->base_addr; |
| @@ -378,6 +366,17 @@ static int ibmtr_probe(struct net_device *dev) | |||
| 378 | return -ENODEV; | 366 | return -ENODEV; |
| 379 | } | 367 | } |
| 380 | 368 | ||
| 369 | int __init ibmtr_probe_card(struct net_device *dev) | ||
| 370 | { | ||
| 371 | int err = ibmtr_probe(dev); | ||
| 372 | if (!err) { | ||
| 373 | err = register_netdev(dev); | ||
| 374 | if (err) | ||
| 375 | ibmtr_cleanup_card(dev); | ||
| 376 | } | ||
| 377 | return err; | ||
| 378 | } | ||
| 379 | |||
| 381 | /*****************************************************************************/ | 380 | /*****************************************************************************/ |
| 382 | 381 | ||
| 383 | static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) | 382 | static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr) |
