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

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index d335b250923..7a1023f3875 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -804,16 +804,7 @@ static void prism2_release(u_long arg)
                 iface->local->shutdown = 1;
         }
 
-        if (link->win)
-                pcmcia_release_window(link->win);
-        pcmcia_release_configuration(link->handle);
-        if (link->io.NumPorts1)
-                pcmcia_release_io(link->handle, &link->io);
-        if (link->irq.AssignedIRQ)
-                pcmcia_release_irq(link->handle, &link->irq);
-
-        link->state &= ~DEV_CONFIG;
-
+        pcmcia_disable_device(link->handle);
         PDEBUG(DEBUG_FLOW, "release - done\n");
 }