diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 12:50:48 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 17:28:47 +0100 |
commit | de0c869c8369db671d165d89d56ea561bea48bd9 (patch) | |
tree | 637753ab7e8daa46e9b94268bdbccf213cd26ba0 /sound/pci/vx222 | |
parent | c11b4c68f4e9b92536fae1f000cb734609633c63 (diff) | |
download | op-kernel-dev-de0c869c8369db671d165d89d56ea561bea48bd9.zip op-kernel-dev-de0c869c8369db671d165d89d56ea561bea48bd9.tar.gz |
ALSA: vx222: 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/vx222')
-rw-r--r-- | sound/pci/vx222/vx222.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sound/pci/vx222/vx222.c b/sound/pci/vx222/vx222.c index c5a25e3..ecbaf47 100644 --- a/sound/pci/vx222/vx222.c +++ b/sound/pci/vx222/vx222.c @@ -259,32 +259,17 @@ static void snd_vx222_remove(struct pci_dev *pci) #ifdef CONFIG_PM_SLEEP static int snd_vx222_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_vx222 *vx = card->private_data; - int err; - err = snd_vx_suspend(&vx->core); - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); - return err; + return snd_vx_suspend(&vx->core); } static int snd_vx222_resume(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct snd_vx222 *vx = card->private_data; - 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); return snd_vx_resume(&vx->core); } |