[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>

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index dce7e687fd4a..70269fc10f30 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -289,6 +289,7 @@ out:
 cs_failed:
         cs_error(link->handle, last_fn, last_ret);
         link->dev = NULL;
+
         pcmcia_release_configuration(link->handle);
         pcmcia_release_io(link->handle, &link->io);
         pcmcia_release_irq(link->handle, &link->irq);
@@ -306,17 +307,11 @@ static void qlogic_release(dev_link_t *link)
         DEBUG(0, "qlogic_release(0x%p)\n", link);
 
         scsi_remove_host(info->host);
-        link->dev = NULL;
 
         free_irq(link->irq.AssignedIRQ, info->host);
-
-        pcmcia_release_configuration(link->handle);
-        pcmcia_release_io(link->handle, &link->io);
-        pcmcia_release_irq(link->handle, &link->irq);
+        pcmcia_disable_device(link->handle);
 
         scsi_host_put(info->host);
-
-        link->state &= ~DEV_CONFIG;
 }
 
 /*====================================================================*/