Commit e909bfdf authored by Takashi Iwai's avatar Takashi Iwai

ALSA: via82xx: Simplify PM callbacks

This is a similar cleanup like the commit [3db084fd: 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: default avatarTakashi Iwai <tiwai@suse.de>
parent 6f9eb021
...@@ -2271,7 +2271,6 @@ static int snd_via82xx_chip_init(struct via82xx *chip) ...@@ -2271,7 +2271,6 @@ static int snd_via82xx_chip_init(struct via82xx *chip)
*/ */
static int snd_via82xx_suspend(struct device *dev) 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 snd_card *card = dev_get_drvdata(dev);
struct via82xx *chip = card->private_data; struct via82xx *chip = card->private_data;
int i; int i;
...@@ -2291,28 +2290,15 @@ static int snd_via82xx_suspend(struct device *dev) ...@@ -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); 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; return 0;
} }
static int snd_via82xx_resume(struct device *dev) 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 snd_card *card = dev_get_drvdata(dev);
struct via82xx *chip = card->private_data; struct via82xx *chip = card->private_data;
int i; 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); snd_via82xx_chip_init(chip);
if (chip->chip_type == TYPE_VIA686) { if (chip->chip_type == TYPE_VIA686) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment