diff options
author | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-01-15 03:32:39 -0500 |
---|---|---|
committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2006-03-31 10:15:50 -0500 |
commit | 5f2a71fcb7995633b335a1e380ac63a968e61320 (patch) | |
tree | d47f4227d314fc9f298b75c217fa78440004e6e7 /drivers/net/pcmcia/axnet_cs.c | |
parent | 1de9cedfbdff1d8adb662cd3afc5bda66e393351 (diff) |
[PATCH] pcmcia: add pcmcia_disable_device
pcmcia_disable_device(struct pcmcia_device *p_dev) performs the necessary
cleanups upon device or driver removal: it calls the appropriate
pcmcia_release_* functions, and can replace (most) of the current drivers'
_release() functions.
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/axnet_cs.c')
-rw-r--r-- | drivers/net/pcmcia/axnet_cs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 1cc94b2d76c1..9b9c0f19b21c 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
@@ -456,13 +456,7 @@ failed: | |||
456 | 456 | ||
457 | static void axnet_release(dev_link_t *link) | 457 | static void axnet_release(dev_link_t *link) |
458 | { | 458 | { |
459 | DEBUG(0, "axnet_release(0x%p)\n", link); | 459 | pcmcia_disable_device(link->handle); |
460 | |||
461 | pcmcia_release_configuration(link->handle); | ||
462 | pcmcia_release_io(link->handle, &link->io); | ||
463 | pcmcia_release_irq(link->handle, &link->irq); | ||
464 | |||
465 | link->state &= ~DEV_CONFIG; | ||
466 | } | 460 | } |
467 | 461 | ||
468 | static int axnet_suspend(struct pcmcia_device *p_dev) | 462 | static int axnet_suspend(struct pcmcia_device *p_dev) |