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

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index 489ef7f3d950..adb90b679d7d 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -437,11 +437,8 @@ static int airo_suspend(struct pcmcia_device *p_dev)
         dev_link_t *link = dev_to_instance(p_dev);
         local_info_t *local = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
+        if (link->state & DEV_CONFIG)
                 netif_device_detach(local->eth_dev);
-                pcmcia_release_configuration(link->handle);
-        }
 
         return 0;
 }
@@ -451,9 +448,7 @@ static int airo_resume(struct pcmcia_device *p_dev)
         dev_link_t *link = dev_to_instance(p_dev);
         local_info_t *local = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
+        if ((link->state & DEV_CONFIG) && (link->open)) {
                 reset_airo_card(local->eth_dev);
                 netif_device_attach(local->eth_dev);
         }