[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, 8 deletions

diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index 0ce4165efc8f..89e16cd1be8c 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -429,7 +429,6 @@ static int orinoco_cs_suspend(struct pcmcia_device *p_dev)
         int err = 0;
         unsigned long flags;
 
-        link->state |= DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
                 /* This is probably racy, but I can't think of
                    a better way, short of rewriting the PCMCIA
@@ -447,8 +446,6 @@ static int orinoco_cs_suspend(struct pcmcia_device *p_dev)
 
                         spin_unlock_irqrestore(&priv->lock, flags);
                 }
-
-                pcmcia_release_configuration(link->handle);
         }
 
         return 0;
@@ -463,12 +460,7 @@ static int orinoco_cs_resume(struct pcmcia_device *p_dev)
         int err = 0;
         unsigned long flags;
 
-        link->state &= ~DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
-                /* FIXME: should we double check that this is
-                 * the same card as we had before */
-                pcmcia_request_configuration(link->handle, &link->conf);
-
                 if (! test_bit(0, &card->hard_reset_in_progress)) {
                         err = orinoco_reinit_firmware(dev);
                         if (err) {