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/com20020_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/com20020_cs.c')
-rw-r--r-- | drivers/net/pcmcia/com20020_cs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c index 2827a48ea37..a0ec5e7aacc 100644 --- a/drivers/net/pcmcia/com20020_cs.c +++ b/drivers/net/pcmcia/com20020_cs.c | |||
@@ -377,16 +377,8 @@ failed: | |||
377 | 377 | ||
378 | static void com20020_release(dev_link_t *link) | 378 | static void com20020_release(dev_link_t *link) |
379 | { | 379 | { |
380 | 380 | DEBUG(0, "com20020_release(0x%p)\n", link); | |
381 | DEBUG(1,"release...\n"); | 381 | pcmcia_disable_device(link->handle); |
382 | |||
383 | DEBUG(0, "com20020_release(0x%p)\n", link); | ||
384 | |||
385 | pcmcia_release_configuration(link->handle); | ||
386 | pcmcia_release_io(link->handle, &link->io); | ||
387 | pcmcia_release_irq(link->handle, &link->irq); | ||
388 | |||
389 | link->state &= ~(DEV_CONFIG | DEV_RELEASE_PENDING); | ||
390 | } | 382 | } |
391 | 383 | ||
392 | static int com20020_suspend(struct pcmcia_device *p_dev) | 384 | static int com20020_suspend(struct pcmcia_device *p_dev) |