aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-01-08 06:50:57 -0500
committerTakashi Iwai <tiwai@suse.de>2015-01-09 11:28:47 -0500
commit3e41c9b5a1ca2acfd9306a918fe3903f02eb89ca (patch)
tree209904813e2d1a380b0b3182be05744bad7af280
parentde0c869c8369db671d165d89d56ea561bea48bd9 (diff)
ALSA: ymfpci: Simplify PM callbacks
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>
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 81c916a5eb96..2b0b8f559ab3 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2326,7 +2326,6 @@ static int saved_regs_index[] = {
2326 2326
2327static int snd_ymfpci_suspend(struct device *dev) 2327static int snd_ymfpci_suspend(struct device *dev)
2328{ 2328{
2329 struct pci_dev *pci = to_pci_dev(dev);
2330 struct snd_card *card = dev_get_drvdata(dev); 2329 struct snd_card *card = dev_get_drvdata(dev);
2331 struct snd_ymfpci *chip = card->private_data; 2330 struct snd_ymfpci *chip = card->private_data;
2332 unsigned int i; 2331 unsigned int i;
@@ -2347,9 +2346,6 @@ static int snd_ymfpci_suspend(struct device *dev)
2347 snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0); 2346 snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);
2348 snd_ymfpci_writel(chip, YDSXGR_BUF441OUTVOL, 0); 2347 snd_ymfpci_writel(chip, YDSXGR_BUF441OUTVOL, 0);
2349 snd_ymfpci_disable_dsp(chip); 2348 snd_ymfpci_disable_dsp(chip);
2350 pci_disable_device(pci);
2351 pci_save_state(pci);
2352 pci_set_power_state(pci, PCI_D3hot);
2353 return 0; 2349 return 0;
2354} 2350}
2355 2351
@@ -2360,14 +2356,6 @@ static int snd_ymfpci_resume(struct device *dev)
2360 struct snd_ymfpci *chip = card->private_data; 2356 struct snd_ymfpci *chip = card->private_data;
2361 unsigned int i; 2357 unsigned int i;
2362 2358
2363 pci_set_power_state(pci, PCI_D0);
2364 pci_restore_state(pci);
2365 if (pci_enable_device(pci) < 0) {
2366 dev_err(dev, "pci_enable_device failed, disabling device\n");
2367 snd_card_disconnect(card);
2368 return -EIO;
2369 }
2370 pci_set_master(pci);
2371 snd_ymfpci_aclink_reset(pci); 2359 snd_ymfpci_aclink_reset(pci);
2372 snd_ymfpci_codec_ready(chip, 0); 2360 snd_ymfpci_codec_ready(chip, 0);
2373 snd_ymfpci_download_image(chip); 2361 snd_ymfpci_download_image(chip);