[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, 7 insertions, 14 deletions

diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 8839c4faafd..56700b154d4 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1181,20 +1181,13 @@ config_failed:			/* CS_EXIT_TEST() calls jump to here... */
 
 static void smc91c92_release(dev_link_t *link)
 {
-
-    DEBUG(0, "smc91c92_release(0x%p)\n", link);
-
-    pcmcia_release_configuration(link->handle);
-    pcmcia_release_io(link->handle, &link->io);
-    pcmcia_release_irq(link->handle, &link->irq);
-    if (link->win) {
-        struct net_device *dev = link->priv;
-        struct smc_private *smc = netdev_priv(dev);
-        iounmap(smc->base);
-        pcmcia_release_window(link->win);
-    }
-
-    link->state &= ~DEV_CONFIG;
+        DEBUG(0, "smc91c92_release(0x%p)\n", link);
+        if (link->win) {
+                struct net_device *dev = link->priv;
+                struct smc_private *smc = netdev_priv(dev);
+                iounmap(smc->base);
+        }
+        pcmcia_disable_device(link->handle);
 }
 
 /*======================================================================