diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 12:44:01 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 16:24:18 +0100 |
commit | dc3b10eb64edd977fb5173f72fc66cc8687e61be (patch) | |
tree | e30bb5d10e90d39d7d9a0d899ee2b85f81153c6a /sound/pci/als4000.c | |
parent | 08aa0e34305059a80f38e039f085fe91a7587cca (diff) | |
download | op-kernel-dev-dc3b10eb64edd977fb5173f72fc66cc8687e61be.zip op-kernel-dev-dc3b10eb64edd977fb5173f72fc66cc8687e61be.tar.gz |
ALSA: als4000: Simplify PM callbacks
This is a similar cleanup like the commit [3db084fd0af5: ALSA: fm801:
PCI core handles power state for us].
Since pci_set_power_state(), pci_save_state() and pci_restore_state()
are already done in the PCI core side, so we don't need to it doubly.
Also, pci_enable_device(), pci_disable_device() and pci_set_master()
calls in PM callbacks are superfluous nowadays, too, so get rid of
them as well.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/als4000.c')
-rw-r--r-- | sound/pci/als4000.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index d3e6424..9460852 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c @@ -988,7 +988,6 @@ static void snd_card_als4000_remove(struct pci_dev *pci) #ifdef CONFIG_PM_SLEEP static int snd_als4000_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_card_als4000 *acard = card->private_data; struct snd_sb *chip = acard->chip; @@ -997,29 +996,15 @@ static int snd_als4000_suspend(struct device *dev) snd_pcm_suspend_all(chip->pcm); snd_sbmixer_suspend(chip); - - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } static int snd_als4000_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_card_als4000 *acard = card->private_data; struct snd_sb *chip = acard->chip; - pci_set_power_state(pci, PCI_D0); - pci_restore_state(pci); - if (pci_enable_device(pci) < 0) { - dev_err(dev, "pci_enable_device failed, disabling device\n"); - snd_card_disconnect(card); - return -EIO; - } - pci_set_master(pci); - snd_als4000_configure(chip); snd_sbdsp_reset(chip); snd_sbmixer_resume(chip); |