diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 06:49:03 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 10:24:23 -0500 |
commit | fc9b6061cf9c42460e482f7a5947ee8120ff0960 (patch) | |
tree | 6fa34201b8560c1db8b0d3980605615b4294d833 | |
parent | cd86f4593db6ca0256b23a33af5577d5239e78ce (diff) |
ALSA: nm256: 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/nm256/nm256.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index 4e41a4e29a1e..8598f2b47eb3 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c | |||
@@ -1392,7 +1392,6 @@ snd_nm256_peek_for_sig(struct nm256 *chip) | |||
1392 | */ | 1392 | */ |
1393 | static int nm256_suspend(struct device *dev) | 1393 | static int nm256_suspend(struct device *dev) |
1394 | { | 1394 | { |
1395 | struct pci_dev *pci = to_pci_dev(dev); | ||
1396 | struct snd_card *card = dev_get_drvdata(dev); | 1395 | struct snd_card *card = dev_get_drvdata(dev); |
1397 | struct nm256 *chip = card->private_data; | 1396 | struct nm256 *chip = card->private_data; |
1398 | 1397 | ||
@@ -1400,15 +1399,11 @@ static int nm256_suspend(struct device *dev) | |||
1400 | snd_pcm_suspend_all(chip->pcm); | 1399 | snd_pcm_suspend_all(chip->pcm); |
1401 | snd_ac97_suspend(chip->ac97); | 1400 | snd_ac97_suspend(chip->ac97); |
1402 | chip->coeffs_current = 0; | 1401 | chip->coeffs_current = 0; |
1403 | pci_disable_device(pci); | ||
1404 | pci_save_state(pci); | ||
1405 | pci_set_power_state(pci, PCI_D3hot); | ||
1406 | return 0; | 1402 | return 0; |
1407 | } | 1403 | } |
1408 | 1404 | ||
1409 | static int nm256_resume(struct device *dev) | 1405 | static int nm256_resume(struct device *dev) |
1410 | { | 1406 | { |
1411 | struct pci_dev *pci = to_pci_dev(dev); | ||
1412 | struct snd_card *card = dev_get_drvdata(dev); | 1407 | struct snd_card *card = dev_get_drvdata(dev); |
1413 | struct nm256 *chip = card->private_data; | 1408 | struct nm256 *chip = card->private_data; |
1414 | int i; | 1409 | int i; |
@@ -1416,15 +1411,6 @@ static int nm256_resume(struct device *dev) | |||
1416 | /* Perform a full reset on the hardware */ | 1411 | /* Perform a full reset on the hardware */ |
1417 | chip->in_resume = 1; | 1412 | chip->in_resume = 1; |
1418 | 1413 | ||
1419 | pci_set_power_state(pci, PCI_D0); | ||
1420 | pci_restore_state(pci); | ||
1421 | if (pci_enable_device(pci) < 0) { | ||
1422 | dev_err(dev, "pci_enable_device failed, disabling device\n"); | ||
1423 | snd_card_disconnect(card); | ||
1424 | return -EIO; | ||
1425 | } | ||
1426 | pci_set_master(pci); | ||
1427 | |||
1428 | snd_nm256_init_chip(chip); | 1414 | snd_nm256_init_chip(chip); |
1429 | 1415 | ||
1430 | /* restore ac97 */ | 1416 | /* restore ac97 */ |