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

index b039b46152c62ff0f5ff20359e58e2c4bdb50080..e1560bf0d26a27d4d9cc634b4e344045658d8b92 100644 (file)
@@ -2798,7 +2798,6 @@ static void snd_ice1712_remove(struct pci_dev *pci)
 #ifdef CONFIG_PM_SLEEP
 static int snd_ice1712_suspend(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct snd_ice1712 *ice = card->private_data;
 
@@ -2820,16 +2819,11 @@ static int snd_ice1712_suspend(struct device *dev)
 
        if (ice->pm_suspend)
                ice->pm_suspend(ice);
-
-       pci_disable_device(pci);
-       pci_save_state(pci);
-       pci_set_power_state(pci, PCI_D3hot);
        return 0;
 }
 
 static int snd_ice1712_resume(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct snd_ice1712 *ice = card->private_data;
        int rate;
@@ -2837,16 +2831,6 @@ static int snd_ice1712_resume(struct device *dev)
        if (!ice->pm_suspend_enabled)
                return 0;
 
-       pci_set_power_state(pci, PCI_D0);
-       pci_restore_state(pci);
-
-       if (pci_enable_device(pci) < 0) {
-               snd_card_disconnect(card);
-               return -EIO;
-       }
-
-       pci_set_master(pci);
-
        if (ice->cur_rate)
                rate = ice->cur_rate;
        else