mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
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>
This commit is contained in:
parent
435e25c67d
commit
28394f0e87
@ -518,7 +518,6 @@ void snd_ad1816a_suspend(struct snd_ad1816a *chip)
|
|||||||
int reg;
|
int reg;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
spin_lock_irqsave(&chip->lock, flags);
|
spin_lock_irqsave(&chip->lock, flags);
|
||||||
for (reg = 0; reg < 48; reg++)
|
for (reg = 0; reg < 48; reg++)
|
||||||
chip->image[reg] = snd_ad1816a_read(chip, reg);
|
chip->image[reg] = snd_ad1816a_read(chip, reg);
|
||||||
|
@ -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;
|
struct snd_sb *chip = acard->chip;
|
||||||
|
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
snd_sbmixer_suspend(chip);
|
snd_sbmixer_suspend(chip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -434,7 +434,6 @@ static int snd_cmi8328_suspend(struct device *pdev, unsigned int n,
|
|||||||
cmi = card->private_data;
|
cmi = card->private_data;
|
||||||
snd_cmi8328_cfg_save(cmi->port, cmi->cfg);
|
snd_cmi8328_cfg_save(cmi->port, cmi->cfg);
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(cmi->wss->pcm);
|
|
||||||
cmi->wss->suspend(cmi->wss);
|
cmi->wss->suspend(cmi->wss);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -484,7 +484,6 @@ static int snd_cmi8330_suspend(struct snd_card *card)
|
|||||||
struct snd_cmi8330 *acard = card->private_data;
|
struct snd_cmi8330 *acard = card->private_data;
|
||||||
|
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(acard->pcm);
|
|
||||||
acard->wss->suspend(acard->wss);
|
acard->wss->suspend(acard->wss);
|
||||||
snd_sbmixer_suspend(acard->sb);
|
snd_sbmixer_suspend(acard->sb);
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -301,10 +301,8 @@ static int snd_es968_pnp_suspend(struct pnp_card_link *pcard,
|
|||||||
pm_message_t state)
|
pm_message_t state)
|
||||||
{
|
{
|
||||||
struct snd_card *card = pnp_get_card_drvdata(pcard);
|
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_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
|
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
|
|
||||||
/* power down */
|
/* power down */
|
||||||
chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);
|
chip->pm_reg = (unsigned char)snd_es18xx_read(chip, ES18XX_PM);
|
||||||
chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);
|
chip->pm_reg |= (ES18XX_PM_FM | ES18XX_PM_SUS);
|
||||||
|
@ -356,7 +356,6 @@ static int snd_jazz16_suspend(struct device *pdev, unsigned int n,
|
|||||||
struct snd_sb *chip = acard->chip;
|
struct snd_sb *chip = acard->chip;
|
||||||
|
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
snd_sbmixer_suspend(chip);
|
snd_sbmixer_suspend(chip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -471,7 +471,6 @@ static int snd_sb16_suspend(struct snd_card *card, pm_message_t state)
|
|||||||
struct snd_sb *chip = acard->chip;
|
struct snd_sb *chip = acard->chip;
|
||||||
|
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
snd_sbmixer_suspend(chip);
|
snd_sbmixer_suspend(chip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -218,7 +218,6 @@ static int snd_sb8_suspend(struct device *dev, unsigned int n,
|
|||||||
struct snd_sb *chip = acard->chip;
|
struct snd_sb *chip = acard->chip;
|
||||||
|
|
||||||
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
snd_sbmixer_suspend(chip);
|
snd_sbmixer_suspend(chip);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -1625,7 +1625,6 @@ static void snd_wss_suspend(struct snd_wss *chip)
|
|||||||
int reg;
|
int reg;
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
|
|
||||||
snd_pcm_suspend_all(chip->pcm);
|
|
||||||
spin_lock_irqsave(&chip->reg_lock, flags);
|
spin_lock_irqsave(&chip->reg_lock, flags);
|
||||||
for (reg = 0; reg < 32; reg++)
|
for (reg = 0; reg < 32; reg++)
|
||||||
chip->image[reg] = snd_wss_in(chip, reg);
|
chip->image[reg] = snd_wss_in(chip, reg);
|
||||||
|
Loading…
Reference in New Issue
Block a user