]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ALSA: azt3328: Simplify PM callbacks
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Jan 2015 11:44:47 +0000 (12:44 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 9 Jan 2015 15:24:19 +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/azt3328.c

index fdbb9c05c77b74274ee7c07e4056fc7fbc7944e6..bbacc75c902a339471baa8313229ea2eaca1a388 100644 (file)
@@ -2694,7 +2694,6 @@ snd_azf3328_resume_ac97(const struct snd_azf3328 *chip)
 static int
 snd_azf3328_suspend(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        struct snd_azf3328 *chip = card->private_data;
        u16 *saved_regs_ctrl_u16;
@@ -2720,29 +2719,15 @@ snd_azf3328_suspend(struct device *dev)
                ARRAY_SIZE(chip->saved_regs_mpu), chip->saved_regs_mpu);
        snd_azf3328_suspend_regs(chip, chip->opl3_io,
                ARRAY_SIZE(chip->saved_regs_opl3), chip->saved_regs_opl3);
-
-       pci_disable_device(pci);
-       pci_save_state(pci);
-       pci_set_power_state(pci, PCI_D3hot);
        return 0;
 }
 
 static int
 snd_azf3328_resume(struct device *dev)
 {
-       struct pci_dev *pci = to_pci_dev(dev);
        struct snd_card *card = dev_get_drvdata(dev);
        const struct snd_azf3328 *chip = 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_azf3328_resume_regs(chip, chip->saved_regs_game, chip->game_io,
                                        ARRAY_SIZE(chip->saved_regs_game));
        snd_azf3328_resume_regs(chip, chip->saved_regs_mpu, chip->mpu_io,