diff options
Diffstat (limited to 'drivers/net/smc-ultra.c')
| -rw-r--r-- | drivers/net/smc-ultra.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c index ba8593ac3f8a..3db30cd0625e 100644 --- a/drivers/net/smc-ultra.c +++ b/drivers/net/smc-ultra.c | |||
| @@ -168,18 +168,6 @@ static int __init do_ultra_probe(struct net_device *dev) | |||
| 168 | return -ENODEV; | 168 | return -ENODEV; |
| 169 | } | 169 | } |
| 170 | 170 | ||
| 171 | static void cleanup_card(struct net_device *dev) | ||
| 172 | { | ||
| 173 | /* NB: ultra_close_card() does free_irq */ | ||
| 174 | #ifdef __ISAPNP__ | ||
| 175 | struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; | ||
| 176 | if (idev) | ||
| 177 | pnp_device_detach(idev); | ||
| 178 | #endif | ||
| 179 | release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT); | ||
| 180 | iounmap(ei_status.mem); | ||
| 181 | } | ||
| 182 | |||
| 183 | #ifndef MODULE | 171 | #ifndef MODULE |
| 184 | struct net_device * __init ultra_probe(int unit) | 172 | struct net_device * __init ultra_probe(int unit) |
| 185 | { | 173 | { |
| @@ -594,6 +582,18 @@ init_module(void) | |||
| 594 | return -ENXIO; | 582 | return -ENXIO; |
| 595 | } | 583 | } |
| 596 | 584 | ||
| 585 | static void cleanup_card(struct net_device *dev) | ||
| 586 | { | ||
| 587 | /* NB: ultra_close_card() does free_irq */ | ||
| 588 | #ifdef __ISAPNP__ | ||
| 589 | struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv; | ||
| 590 | if (idev) | ||
| 591 | pnp_device_detach(idev); | ||
| 592 | #endif | ||
| 593 | release_region(dev->base_addr - ULTRA_NIC_OFFSET, ULTRA_IO_EXTENT); | ||
| 594 | iounmap(ei_status.mem); | ||
| 595 | } | ||
| 596 | |||
| 597 | void | 597 | void |
| 598 | cleanup_module(void) | 598 | cleanup_module(void) |
| 599 | { | 599 | { |
