diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-11 13:26:48 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-11 13:26:48 +0300 |
| commit | 9e5947465d72ef1b3a88104474ab2adf78837220 (patch) | |
| tree | 2e71fa8e496b8e047e5a90e81b685ed1f8d3ed7f /sound/pci/sis7019.c | |
| parent | 624afe4dc9a08992b200046dfe8a61f19bab74ab (diff) | |
| parent | 3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (diff) | |
| download | linux-9e5947465d72ef1b3a88104474ab2adf78837220.tar.xz | |
Merge branch 'topic/pci-cleanup' into for-next
Diffstat (limited to 'sound/pci/sis7019.c')
| -rw-r--r-- | sound/pci/sis7019.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index 5e9437ba6eec..efe669b80256 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c @@ -1208,7 +1208,6 @@ static int sis_chip_init(struct sis7019 *sis) #ifdef CONFIG_PM_SLEEP static int sis_suspend(struct device *dev) { - struct pci_dev *pci = to_pci_dev(dev); struct snd_card *card = dev_get_drvdata(dev); struct sis7019 *sis = card->private_data; void __iomem *ioaddr = sis->ioaddr; @@ -1237,9 +1236,6 @@ static int sis_suspend(struct device *dev) ioaddr += 4096; } - pci_disable_device(pci); - pci_save_state(pci); - pci_set_power_state(pci, PCI_D3hot); return 0; } @@ -1251,14 +1247,6 @@ static int sis_resume(struct device *dev) void __iomem *ioaddr = sis->ioaddr; int i; - pci_set_power_state(pci, PCI_D0); - pci_restore_state(pci); - - if (pci_enable_device(pci) < 0) { - dev_err(&pci->dev, "unable to re-enable device\n"); - goto error; - } - if (sis_chip_init(sis)) { dev_err(&pci->dev, "unable to re-init controller\n"); goto error; @@ -1281,7 +1269,6 @@ static int sis_resume(struct device *dev) memset(sis->suspend_state[0], 0, 4096); sis->irq = pci->irq; - pci_set_master(pci); if (sis->codecs_present & SIS_PRIMARY_CODEC_PRESENT) snd_ac97_resume(sis->ac97[0]); |