ALSA: ens137x: Simplify PM callbacks
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jan 2015 11:47:10 +0000 (12:47 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 9 Jan 2015 15:24:21 +0000 (16:24 +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/ens1370.c

index d94cb3ca7a643a918f7ae21bdcbf95eb5ab78bd3..1badd91f62838053316d4b24d638d81c4b3b21d5 100644 (file)
@@ -2049,7 +2049,6 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq)
 #ifdef CONFIG_PM_SLEEP
 static int snd_ensoniq_suspend(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct ensoniq *ensoniq = card->private_data;
        
@@ -2070,28 +2069,14 @@ static int snd_ensoniq_suspend(struct device *dev)
        udelay(100);
        snd_ak4531_suspend(ensoniq->u.es1370.ak4531);
 #endif 
-
-       pci_disable_device(pci);
-       pci_save_state(pci);
-       pci_set_power_state(pci, PCI_D3hot);
        return 0;
 }
 
 static int snd_ensoniq_resume(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct ensoniq *ensoniq = 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);
-
        snd_ensoniq_chip_init(ensoniq);
 
 #ifdef CHIP1371