diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 06:47:31 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 10:24:21 -0500 |
commit | 8b1db4df201b9ad1f5a329438b823e120d463a96 (patch) | |
tree | b1e265d7d0dc96b45ba694324844afa49e541453 | |
parent | 8c3698219119612c239e387e423aa9d90040bc64 (diff) |
ALSA: es1968: 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/es1968.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/pci/es1968.c b/sound/pci/es1968.c index 6039700f8579..631be029f8c0 100644 --- a/sound/pci/es1968.c +++ b/sound/pci/es1968.c | |||
@@ -2383,7 +2383,6 @@ static void snd_es1968_start_irq(struct es1968 *chip) | |||
2383 | */ | 2383 | */ |
2384 | static int es1968_suspend(struct device *dev) | 2384 | static int es1968_suspend(struct device *dev) |
2385 | { | 2385 | { |
2386 | struct pci_dev *pci = to_pci_dev(dev); | ||
2387 | struct snd_card *card = dev_get_drvdata(dev); | 2386 | struct snd_card *card = dev_get_drvdata(dev); |
2388 | struct es1968 *chip = card->private_data; | 2387 | struct es1968 *chip = card->private_data; |
2389 | 2388 | ||
@@ -2396,16 +2395,11 @@ static int es1968_suspend(struct device *dev) | |||
2396 | snd_pcm_suspend_all(chip->pcm); | 2395 | snd_pcm_suspend_all(chip->pcm); |
2397 | snd_ac97_suspend(chip->ac97); | 2396 | snd_ac97_suspend(chip->ac97); |
2398 | snd_es1968_bob_stop(chip); | 2397 | snd_es1968_bob_stop(chip); |
2399 | |||
2400 | pci_disable_device(pci); | ||
2401 | pci_save_state(pci); | ||
2402 | pci_set_power_state(pci, PCI_D3hot); | ||
2403 | return 0; | 2398 | return 0; |
2404 | } | 2399 | } |
2405 | 2400 | ||
2406 | static int es1968_resume(struct device *dev) | 2401 | static int es1968_resume(struct device *dev) |
2407 | { | 2402 | { |
2408 | struct pci_dev *pci = to_pci_dev(dev); | ||
2409 | struct snd_card *card = dev_get_drvdata(dev); | 2403 | struct snd_card *card = dev_get_drvdata(dev); |
2410 | struct es1968 *chip = card->private_data; | 2404 | struct es1968 *chip = card->private_data; |
2411 | struct esschan *es; | 2405 | struct esschan *es; |
@@ -2413,16 +2407,6 @@ static int es1968_resume(struct device *dev) | |||
2413 | if (! chip->do_pm) | 2407 | if (! chip->do_pm) |
2414 | return 0; | 2408 | return 0; |
2415 | 2409 | ||
2416 | /* restore all our config */ | ||
2417 | pci_set_power_state(pci, PCI_D0); | ||
2418 | pci_restore_state(pci); | ||
2419 | if (pci_enable_device(pci) < 0) { | ||
2420 | dev_err(dev, "pci_enable_device failed, disabling device\n"); | ||
2421 | snd_card_disconnect(card); | ||
2422 | return -EIO; | ||
2423 | } | ||
2424 | pci_set_master(pci); | ||
2425 | |||
2426 | snd_es1968_chip_init(chip); | 2410 | snd_es1968_chip_init(chip); |
2427 | 2411 | ||
2428 | /* need to restore the base pointers.. */ | 2412 | /* need to restore the base pointers.. */ |