]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ALSA: vx222: Simplify PM callbacks
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jan 2015 11:50:48 +0000 (12:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 9 Jan 2015 16:28:47 +0000 (17:28 +0100)
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>
sound/pci/vx222/vx222.c

index c5a25e39e3a8ea8f231d94e15ca8fea4cecc6dcf..ecbaf473fc1e8cb0fb855b99505e8e528ecfe17e 100644 (file)
@@ -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);
 }