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/ide | |
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/ide')
-rw-r--r-- | drivers/ide/legacy/ide-cs.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c index 6213bd3caee5..024aad616484 100644 --- a/drivers/ide/legacy/ide-cs.c +++ b/drivers/ide/legacy/ide-cs.c | |||
@@ -369,14 +369,8 @@ void ide_release(dev_link_t *link) | |||
369 | ide_unregister(info->hd); | 369 | ide_unregister(info->hd); |
370 | } | 370 | } |
371 | info->ndev = 0; | 371 | info->ndev = 0; |
372 | link->dev = NULL; | ||
373 | |||
374 | pcmcia_release_configuration(link->handle); | ||
375 | pcmcia_release_io(link->handle, &link->io); | ||
376 | pcmcia_release_irq(link->handle, &link->irq); | ||
377 | |||
378 | link->state &= ~DEV_CONFIG; | ||
379 | 372 | ||
373 | pcmcia_disable_device(link->handle); | ||
380 | } /* ide_release */ | 374 | } /* ide_release */ |
381 | 375 | ||
382 | static int ide_suspend(struct pcmcia_device *dev) | 376 | static int ide_suspend(struct pcmcia_device *dev) |