]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ALSA: via82xx: Simplify PM callbacks
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jan 2015 11:50:27 +0000 (12:50 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 9 Jan 2015 16:28:45 +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/via82xx.c

index e088467fb7366d3b33c751815417fe58d19dee67..120fccbb2461f0dd24bfe34838b1204fc940bcde 100644 (file)
@@ -2271,7 +2271,6 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
  */
 static int snd_via82xx_suspend(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct via82xx *chip = card->private_data;
        int i;
@@ -2291,28 +2290,15 @@ static int snd_via82xx_suspend(struct device *dev)
                chip->capture_src_saved[1] = inb(chip->port + VIA_REG_CAPTURE_CHANNEL + 0x10);
        }
 
-       pci_disable_device(pci);
-       pci_save_state(pci);
-       pci_set_power_state(pci, PCI_D3hot);
        return 0;
 }
 
 static int snd_via82xx_resume(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct via82xx *chip = card->private_data;
        int i;
 
-       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_via82xx_chip_init(chip);
 
        if (chip->chip_type == TYPE_VIA686) {