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

diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf.c b/sound/pcmcia/pdaudiocf/pdaudiocf.c
index 80c53553b815..31f4bdc46ce6 100644
--- a/sound/pcmcia/pdaudiocf/pdaudiocf.c
+++ b/sound/pcmcia/pdaudiocf/pdaudiocf.c
@@ -284,16 +284,11 @@ static int pdacf_suspend(struct pcmcia_device *dev)
         struct snd_pdacf *chip = link->priv;
 
         snd_printdd(KERN_DEBUG "SUSPEND\n");
-        link->state |= DEV_SUSPEND;
         if (chip) {
                 snd_printdd(KERN_DEBUG "snd_pdacf_suspend calling\n");
                 snd_pdacf_suspend(chip, PMSG_SUSPEND);
         }
 
-        snd_printdd(KERN_DEBUG "RESET_PHYSICAL\n");
-        if (link->state & DEV_CONFIG)
-                pcmcia_release_configuration(link->handle);
-
         return 0;
 }
 
@@ -303,12 +298,7 @@ static int pdacf_resume(struct pcmcia_device *dev)
         struct snd_pdacf *chip = link->priv;
 
         snd_printdd(KERN_DEBUG "RESUME\n");
-        link->state &= ~DEV_SUSPEND;
-
-        snd_printdd(KERN_DEBUG "CARD_RESET\n");
         if (DEV_OK(link)) {
-                snd_printdd(KERN_DEBUG "requestconfig...\n");
-                pcmcia_request_configuration(link->handle, &link->conf);
                 if (chip) {
                         snd_printdd(KERN_DEBUG "calling snd_pdacf_resume\n");
                         snd_pdacf_resume(chip);