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/isdn/hardware | |
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/isdn/hardware')
-rw-r--r-- | drivers/isdn/hardware/avm/avm_cs.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/isdn/hardware/avm/avm_cs.c b/drivers/isdn/hardware/avm/avm_cs.c index 2a2b03ff096b..f3889bdc8e43 100644 --- a/drivers/isdn/hardware/avm/avm_cs.c +++ b/drivers/isdn/hardware/avm/avm_cs.c | |||
@@ -367,16 +367,8 @@ found_port: | |||
367 | 367 | ||
368 | static void avmcs_release(dev_link_t *link) | 368 | static void avmcs_release(dev_link_t *link) |
369 | { | 369 | { |
370 | b1pcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); | 370 | b1pcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); |
371 | 371 | pcmcia_disable_device(link->handle); | |
372 | /* Unlink the device chain */ | ||
373 | link->dev = NULL; | ||
374 | |||
375 | /* Don't bother checking to see if these succeed or not */ | ||
376 | pcmcia_release_configuration(link->handle); | ||
377 | pcmcia_release_io(link->handle, &link->io); | ||
378 | pcmcia_release_irq(link->handle, &link->irq); | ||
379 | link->state &= ~DEV_CONFIG; | ||
380 | } /* avmcs_release */ | 372 | } /* avmcs_release */ |
381 | 373 | ||
382 | static int avmcs_suspend(struct pcmcia_device *dev) | 374 | static int avmcs_suspend(struct pcmcia_device *dev) |