Skip to content

Commit 17bc481

Browse files
tiwaitiwai
committed
ALSA: pci: 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>
1 parent 3c40dfe commit 17bc481

32 files changed

+2
-85
lines changed

‎sound/pci/ali5451/ali5451.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1882,10 +1882,8 @@ static int ali_suspend(struct device *dev)
18821882
return 0;
18831883

18841884
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
1885-
for (i = 0; i < chip->num_of_codecs; i++) {
1886-
snd_pcm_suspend_all(chip->pcm[i]);
1885+
for (i = 0; i < chip->num_of_codecs; i++)
18871886
snd_ac97_suspend(chip->ac97[i]);
1888-
}
18891887

18901888
spin_lock_irq(&chip->reg_lock);
18911889

‎sound/pci/als300.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,6 @@ static int snd_als300_suspend(struct device *dev)
731731
struct snd_als300 *chip = card->private_data;
732732

733733
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
734-
snd_pcm_suspend_all(chip->pcm);
735734
snd_ac97_suspend(chip->ac97);
736735
return 0;
737736
}

‎sound/pci/als4000.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -994,7 +994,6 @@ static int snd_als4000_suspend(struct device *dev)
994994

995995
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
996996

997-
snd_pcm_suspend_all(chip->pcm);
998997
snd_sbmixer_suspend(chip);
999998
return 0;
1000999
}

‎sound/pci/atiixp_modem.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,8 +1125,6 @@ static int snd_atiixp_suspend(struct device *dev)
11251125
int i;
11261126

11271127
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
1128-
for (i = 0; i < NUM_ATI_PCMDEVS; i++)
1129-
snd_pcm_suspend_all(chip->pcmdevs[i]);
11301128
for (i = 0; i < NUM_ATI_CODECS; i++)
11311129
snd_ac97_suspend(chip->ac97[i]);
11321130
snd_atiixp_aclink_down(chip);

‎sound/pci/azt3328.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2699,10 +2699,6 @@ snd_azf3328_suspend(struct device *dev)
26992699

27002700
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
27012701

2702-
/* same pcm object for playback/capture */
2703-
snd_pcm_suspend_all(chip->pcm[AZF_CODEC_PLAYBACK]);
2704-
snd_pcm_suspend_all(chip->pcm[AZF_CODEC_I2S_OUT]);
2705-
27062702
snd_azf3328_suspend_ac97(chip);
27072703

27082704
snd_azf3328_suspend_regs(chip, chip->ctrl_io,

‎sound/pci/ca0106/ca0106_main.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1910,11 +1910,8 @@ static int snd_ca0106_suspend(struct device *dev)
19101910
{
19111911
struct snd_card *card = dev_get_drvdata(dev);
19121912
struct snd_ca0106 *chip = card->private_data;
1913-
int i;
19141913

19151914
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
1916-
for (i = 0; i < 4; i++)
1917-
snd_pcm_suspend_all(chip->pcm[i]);
19181915
if (chip->details->ac97)
19191916
snd_ac97_suspend(chip->ac97);
19201917
snd_ca0106_mixer_suspend(chip);

‎sound/pci/cmipci.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3351,10 +3351,6 @@ static int snd_cmipci_suspend(struct device *dev)
33513351

33523352
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
33533353

3354-
snd_pcm_suspend_all(cm->pcm);
3355-
snd_pcm_suspend_all(cm->pcm2);
3356-
snd_pcm_suspend_all(cm->pcm_spdif);
3357-
33583354
/* save registers */
33593355
for (i = 0; i < ARRAY_SIZE(saved_regs); i++)
33603356
cm->saved_regs[i] = snd_cmipci_read(cm, saved_regs[i]);

‎sound/pci/cs4281.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,8 +2002,6 @@ static int cs4281_suspend(struct device *dev)
20022002
unsigned int i;
20032003

20042004
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
2005-
snd_pcm_suspend_all(chip->pcm);
2006-
20072005
snd_ac97_suspend(chip->ac97);
20082006
snd_ac97_suspend(chip->ac97_secondary);
20092007

‎sound/pci/cs46xx/cs46xx_lib.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3781,12 +3781,6 @@ static int snd_cs46xx_suspend(struct device *dev)
37813781

37823782
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
37833783
chip->in_suspend = 1;
3784-
snd_pcm_suspend_all(chip->pcm);
3785-
#ifdef CONFIG_SND_CS46XX_NEW_DSP
3786-
snd_pcm_suspend_all(chip->pcm_rear);
3787-
snd_pcm_suspend_all(chip->pcm_center_lfe);
3788-
snd_pcm_suspend_all(chip->pcm_iec958);
3789-
#endif
37903784
// chip->ac97_powerdown = snd_cs46xx_codec_read(chip, AC97_POWER_CONTROL);
37913785
// chip->ac97_general_purpose = snd_cs46xx_codec_read(chip, BA0_AC97_GENERAL_PURPOSE);
37923786

‎sound/pci/cs5535audio/cs5535audio_pm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ static int __maybe_unused snd_cs5535audio_suspend(struct device *dev)
6262
int i;
6363

6464
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
65-
snd_pcm_suspend_all(cs5535au->pcm);
6665
snd_ac97_suspend(cs5535au->ac97);
6766
for (i = 0; i < NUM_CS5535AUDIO_DMAS; i++) {
6867
struct cs5535audio_dma *dma = &cs5535au->dmas[i];

0 commit comments

Comments
 (0)