[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/serial/serial_cs.c b/drivers/serial/serial_cs.c
index ff38820a03f5..b6b460fa693f 100644
--- a/drivers/serial/serial_cs.c
+++ b/drivers/serial/serial_cs.c
@@ -151,7 +151,6 @@ static void serial_remove(dev_link_t *link)
 static int serial_suspend(struct pcmcia_device *dev)
 {
         dev_link_t *link = dev_to_instance(dev);
-        link->state |= DEV_SUSPEND;
 
         if (link->state & DEV_CONFIG) {
                 struct serial_info *info = link->priv;
@@ -160,8 +159,8 @@ static int serial_suspend(struct pcmcia_device *dev)
                 for (i = 0; i < info->ndev; i++)
                         serial8250_suspend_port(info->line[i]);
 
-                if (!info->slave)
-                        pcmcia_release_configuration(link->handle);
+                if (info->slave)
+                        link->state &= DEV_SUSPEND_NORELEASE;
         }
 
         return 0;
@@ -170,15 +169,11 @@ static int serial_suspend(struct pcmcia_device *dev)
 static int serial_resume(struct pcmcia_device *dev)
 {
         dev_link_t *link = dev_to_instance(dev);
-        link->state &= ~DEV_SUSPEND;
 
         if (DEV_OK(link)) {
                 struct serial_info *info = link->priv;
                 int i;
 
-                if (!info->slave)
-                        pcmcia_request_configuration(link->handle, &link->conf);
-
                 for (i = 0; i < info->ndev; i++)
                         serial8250_resume_port(info->line[i]);
         }