ALSA: isa: Remove superfluous snd_pcm_suspend*() calls

The call of snd_pcm_suspend_all() & co became superfluous since we
call it in the PCM PM ops.  Let's remove them.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index fba6d22f7f4bdfa3591a47c7ad364a293c038549..61e8c7e524db609443b996641d913ed1278deab4 100644 (file)
--- a/sound/isa/ad1816a/ad1816a_lib.c
+++ b/sound/isa/ad1816a/ad1816a_lib.c
@@ -518,7 +518,6 @@ void snd_ad1816a_suspend(struct snd_ad1816a *chip)
        int reg;
        unsigned long flags;
 
-       snd_pcm_suspend_all(chip->pcm);
        spin_lock_irqsave(&chip->lock, flags);
        for (reg = 0; reg < 48; reg++)
                chip->image[reg] = snd_ad1816a_read(chip, reg);

diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index f63142ec287ebb094b85189cd398f1d9d66ed31b..571108021e9dea82cc68bfd2114ac9a77667050d 100644 (file)
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -322,7 +322,6 @@ static int snd_als100_pnp_suspend(struct pnp_card_link *pcard, pm_message_t stat
        struct snd_sb *chip = acard->chip;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(chip->pcm);
        snd_sbmixer_suspend(chip);
        return 0;
 }

diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index de6ef1b1cf0eb0718ed0420cf2599451646f5a3b..6179775162019e68a354f67b39d3a4da77644bd9 100644 (file)
--- a/sound/isa/cmi8328.c
+++ b/sound/isa/cmi8328.c
@@ -434,7 +434,6 @@ static int snd_cmi8328_suspend(struct device *pdev, unsigned int n,
        cmi = card->private_data;
        snd_cmi8328_cfg_save(cmi->port, cmi->cfg);
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(cmi->wss->pcm);
        cmi->wss->suspend(cmi->wss);
 
        return 0;

diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 6b8c46942efb4b660b508c55ffe93d0d1bd76e0b..7e5aa06414c45078d2901c8117d82e772bdf3d11 100644 (file)
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -484,7 +484,6 @@ static int snd_cmi8330_suspend(struct snd_card *card)
        struct snd_cmi8330 *acard = card->private_data;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(acard->pcm);
        acard->wss->suspend(acard->wss);
        snd_sbmixer_suspend(acard->sb);
        return 0;

diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 3dfe7e592c251968739f2df86cf0475530674da6..87527627e059789300c7a0df6bc2c9283ffc927b 100644 (file)
--- a/sound/isa/es1688/es1688.c
+++ b/sound/isa/es1688/es1688.c
@@ -301,10 +301,8 @@ static int snd_es968_pnp_suspend(struct pnp_card_link *pcard,
                                 pm_message_t state)
 {
        struct snd_card *card = pnp_get_card_drvdata(pcard);
-       struct snd_es1688 *chip = card->private_data;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(chip->pcm);
        return 0;
 }
 

diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 0d103d6f805e3282d4c4be73d8df8ee99801fd63..77aa9a27fb3beb4dbe6e9fb33882770aa22b9964 100644 (file)
--- a/sound/isa/es18xx.c
+++ b/sound/isa/es18xx.c
@@ -1731,8 +1731,6 @@ static int snd_es18xx_suspend(struct snd_card *card, pm_message_t state)
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 
-       snd_pcm_suspend_all(chip->pcm);
-
        /* power down */
        chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);
        chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);

diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index bfa0055e1fd6677dc2395f8b45918454ee6b2619..7a313ff589c781578a8ef0920979f66cc73f6e4a 100644 (file)
--- a/sound/isa/sb/jazz16.c
+++ b/sound/isa/sb/jazz16.c
@@ -356,7 +356,6 @@ static int snd_jazz16_suspend(struct device *pdev, unsigned int n,
        struct snd_sb *chip = acard->chip;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(chip->pcm);
        snd_sbmixer_suspend(chip);
        return 0;
 }

diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 8f9ebeb998f6df3416917124e6effc706416eccf..3844d4c02f49a917101dd283919e4b369a8e39b6 100644 (file)
--- a/sound/isa/sb/sb16.c
+++ b/sound/isa/sb/sb16.c
@@ -471,7 +471,6 @@ static int snd_sb16_suspend(struct snd_card *card, pm_message_t state)
        struct snd_sb *chip = acard->chip;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(chip->pcm);
        snd_sbmixer_suspend(chip);
        return 0;
 }

diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index d77dcba276b544b750c452b622981c6c7a0ff585..aa2a83eb81a988a5e5947d9edce8afae4c91cf6f 100644 (file)
--- a/sound/isa/sb/sb8.c
+++ b/sound/isa/sb/sb8.c
@@ -218,7 +218,6 @@ static int snd_sb8_suspend(struct device *dev, unsigned int n,
        struct snd_sb *chip = acard->chip;
 
        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-       snd_pcm_suspend_all(chip->pcm);
        snd_sbmixer_suspend(chip);
        return 0;
 }

diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 3a5008837576030685f0018f0aafe71ba8fb8697..b11ef97bce1bc139f9f33149d9613f7c2c6c3313 100644 (file)
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1625,7 +1625,6 @@ static void snd_wss_suspend(struct snd_wss *chip)
        int reg;
        unsigned long flags;
 
-       snd_pcm_suspend_all(chip->pcm);
        spin_lock_irqsave(&chip->reg_lock, flags);
        for (reg = 0; reg < 32; reg++)
                chip->image[reg] = snd_wss_in(chip, reg);