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/hisax/sedlbauer_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/isdn/hisax/sedlbauer_cs.c')
-rw-r--r-- | drivers/isdn/hisax/sedlbauer_cs.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/isdn/hisax/sedlbauer_cs.c b/drivers/isdn/hisax/sedlbauer_cs.c index 6f5213a18a8d..e59539157d19 100644 --- a/drivers/isdn/hisax/sedlbauer_cs.c +++ b/drivers/isdn/hisax/sedlbauer_cs.c | |||
@@ -467,23 +467,8 @@ static void sedlbauer_release(dev_link_t *link) | |||
467 | HiSax_closecard(local->cardnr); | 467 | HiSax_closecard(local->cardnr); |
468 | } | 468 | } |
469 | } | 469 | } |
470 | /* Unlink the device chain */ | ||
471 | link->dev = NULL; | ||
472 | 470 | ||
473 | /* | 471 | pcmcia_disable_device(link->handle); |
474 | In a normal driver, additional code may be needed to release | ||
475 | other kernel data structures associated with this device. | ||
476 | */ | ||
477 | |||
478 | /* Don't bother checking to see if these succeed or not */ | ||
479 | if (link->win) | ||
480 | pcmcia_release_window(link->win); | ||
481 | pcmcia_release_configuration(link->handle); | ||
482 | if (link->io.NumPorts1) | ||
483 | pcmcia_release_io(link->handle, &link->io); | ||
484 | if (link->irq.AssignedIRQ) | ||
485 | pcmcia_release_irq(link->handle, &link->irq); | ||
486 | link->state &= ~DEV_CONFIG; | ||
487 | } /* sedlbauer_release */ | 472 | } /* sedlbauer_release */ |
488 | 473 | ||
489 | static int sedlbauer_suspend(struct pcmcia_device *p_dev) | 474 | static int sedlbauer_suspend(struct pcmcia_device *p_dev) |