summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-01-11 12:01:18 -0500
committerTakashi Iwai <tiwai@suse.de>2019-01-15 11:46:57 -0500
commit28394f0e8735a40ec4b68fac8f484cdc9a4a0569 (patch)
tree163e9fd4bae773a0cb896d5575018bb61863d83c
parent435e25c67de7e0a21fbb32239bded0cefc488e20 (diff)
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>
-rw-r--r--sound/isa/ad1816a/ad1816a_lib.c1
-rw-r--r--sound/isa/als100.c1
-rw-r--r--sound/isa/cmi8328.c1
-rw-r--r--sound/isa/cmi8330.c1
-rw-r--r--sound/isa/es1688/es1688.c2
-rw-r--r--sound/isa/es18xx.c2
-rw-r--r--sound/isa/sb/jazz16.c1
-rw-r--r--sound/isa/sb/sb16.c1
-rw-r--r--sound/isa/sb/sb8.c1
-rw-r--r--sound/isa/wss/wss_lib.c1
10 files changed, 0 insertions, 12 deletions
diff --git a/sound/isa/ad1816a/ad1816a_lib.c b/sound/isa/ad1816a/ad1816a_lib.c
index fba6d22f7f4b..61e8c7e524db 100644
--- 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)
518 int reg; 518 int reg;
519 unsigned long flags; 519 unsigned long flags;
520 520
521 snd_pcm_suspend_all(chip->pcm);
522 spin_lock_irqsave(&chip->lock, flags); 521 spin_lock_irqsave(&chip->lock, flags);
523 for (reg = 0; reg < 48; reg++) 522 for (reg = 0; reg < 48; reg++)
524 chip->image[reg] = snd_ad1816a_read(chip, reg); 523 chip->image[reg] = snd_ad1816a_read(chip, reg);
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index f63142ec287e..571108021e9d 100644
--- 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
322 struct snd_sb *chip = acard->chip; 322 struct snd_sb *chip = acard->chip;
323 323
324 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 324 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
325 snd_pcm_suspend_all(chip->pcm);
326 snd_sbmixer_suspend(chip); 325 snd_sbmixer_suspend(chip);
327 return 0; 326 return 0;
328} 327}
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c
index de6ef1b1cf0e..617977516201 100644
--- 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,
434 cmi = card->private_data; 434 cmi = card->private_data;
435 snd_cmi8328_cfg_save(cmi->port, cmi->cfg); 435 snd_cmi8328_cfg_save(cmi->port, cmi->cfg);
436 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 436 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
437 snd_pcm_suspend_all(cmi->wss->pcm);
438 cmi->wss->suspend(cmi->wss); 437 cmi->wss->suspend(cmi->wss);
439 438
440 return 0; 439 return 0;
diff --git a/sound/isa/cmi8330.c b/sound/isa/cmi8330.c
index 6b8c46942efb..7e5aa06414c4 100644
--- a/sound/isa/cmi8330.c
+++ b/sound/isa/cmi8330.c
@@ -484,7 +484,6 @@ static int snd_cmi8330_suspend(struct snd_card *card)
484 struct snd_cmi8330 *acard = card->private_data; 484 struct snd_cmi8330 *acard = card->private_data;
485 485
486 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 486 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
487 snd_pcm_suspend_all(acard->pcm);
488 acard->wss->suspend(acard->wss); 487 acard->wss->suspend(acard->wss);
489 snd_sbmixer_suspend(acard->sb); 488 snd_sbmixer_suspend(acard->sb);
490 return 0; 489 return 0;
diff --git a/sound/isa/es1688/es1688.c b/sound/isa/es1688/es1688.c
index 3dfe7e592c25..87527627e059 100644
--- 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,
301 pm_message_t state) 301 pm_message_t state)
302{ 302{
303 struct snd_card *card = pnp_get_card_drvdata(pcard); 303 struct snd_card *card = pnp_get_card_drvdata(pcard);
304 struct snd_es1688 *chip = card->private_data;
305 304
306 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 305 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
307 snd_pcm_suspend_all(chip->pcm);
308 return 0; 306 return 0;
309} 307}
310 308
diff --git a/sound/isa/es18xx.c b/sound/isa/es18xx.c
index 0d103d6f805e..77aa9a27fb3b 100644
--- 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)
1731 1731
1732 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 1732 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
1733 1733
1734 snd_pcm_suspend_all(chip->pcm);
1735
1736 /* power down */ 1734 /* power down */
1737 chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM); 1735 chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);
1738 chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS); 1736 chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);
diff --git a/sound/isa/sb/jazz16.c b/sound/isa/sb/jazz16.c
index bfa0055e1fd6..7a313ff589c7 100644
--- 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,
356 struct snd_sb *chip = acard->chip; 356 struct snd_sb *chip = acard->chip;
357 357
358 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 358 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
359 snd_pcm_suspend_all(chip->pcm);
360 snd_sbmixer_suspend(chip); 359 snd_sbmixer_suspend(chip);
361 return 0; 360 return 0;
362} 361}
diff --git a/sound/isa/sb/sb16.c b/sound/isa/sb/sb16.c
index 8f9ebeb998f6..3844d4c02f49 100644
--- 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)
471 struct snd_sb *chip = acard->chip; 471 struct snd_sb *chip = acard->chip;
472 472
473 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 473 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
474 snd_pcm_suspend_all(chip->pcm);
475 snd_sbmixer_suspend(chip); 474 snd_sbmixer_suspend(chip);
476 return 0; 475 return 0;
477} 476}
diff --git a/sound/isa/sb/sb8.c b/sound/isa/sb/sb8.c
index d77dcba276b5..aa2a83eb81a9 100644
--- 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,
218 struct snd_sb *chip = acard->chip; 218 struct snd_sb *chip = acard->chip;
219 219
220 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot); 220 snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
221 snd_pcm_suspend_all(chip->pcm);
222 snd_sbmixer_suspend(chip); 221 snd_sbmixer_suspend(chip);
223 return 0; 222 return 0;
224} 223}
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 3a5008837576..b11ef97bce1b 100644
--- 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)
1625 int reg; 1625 int reg;
1626 unsigned long flags; 1626 unsigned long flags;
1627 1627
1628 snd_pcm_suspend_all(chip->pcm);
1629 spin_lock_irqsave(&chip->reg_lock, flags); 1628 spin_lock_irqsave(&chip->reg_lock, flags);
1630 for (reg = 0; reg < 32; reg++) 1629 for (reg = 0; reg < 32; reg++)
1631 chip->image[reg] = snd_wss_in(chip, reg); 1630 chip->image[reg] = snd_wss_in(chip, reg);