[PATCH] pcmcia: default suspend and resume handling

In all but one case, the suspend and resume functions of PCMCIA drivers
contain mostly of calls to pcmcia_release_configuration() and
pcmcia_request_configuration(). Therefore, move this code out of the
drivers and into the core.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

1 files changed, 0 insertions, 6 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 7a1023f3875b..0fb625185452 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -816,8 +816,6 @@ static int hostap_cs_suspend(struct pcmcia_device *p_dev)
 
         PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
 
-        link->state |= DEV_SUSPEND;
-
         if (link->state & DEV_CONFIG) {
                 struct hostap_interface *iface = netdev_priv(dev);
                 if (iface && iface->local)
@@ -827,7 +825,6 @@ static int hostap_cs_suspend(struct pcmcia_device *p_dev)
                         netif_device_detach(dev);
                 }
                 prism2_suspend(dev);
-                pcmcia_release_configuration(link->handle);
         }
 
         return 0;
@@ -841,14 +838,11 @@ static int hostap_cs_resume(struct pcmcia_device *p_dev)
 
         PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
 
-        link->state &= ~DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
                 struct hostap_interface *iface = netdev_priv(dev);
                 if (iface && iface->local)
                         dev_open = iface->local->num_dev_open > 0;
 
-                pcmcia_request_configuration(link->handle, &link->conf);
-
                 prism2_hw_shutdown(dev, 1);
                 prism2_hw_config(dev, dev_open ? 0 : 1);
                 if (dev_open) {