diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 06:44:30 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 10:24:18 -0500 |
commit | 2b5d0891ba8555c8edc21098715324d90a4d5de0 (patch) | |
tree | 084febb3e1ca0daa235dc110d4dae35558200d82 /sound/pci/atiixp_modem.c | |
parent | 94af14691d3783629f5d186acfb1f700fb68ff03 (diff) |
ALSA: atiixp-modem: 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>
Diffstat (limited to 'sound/pci/atiixp_modem.c')
-rw-r--r-- | sound/pci/atiixp_modem.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sound/pci/atiixp_modem.c b/sound/pci/atiixp_modem.c index b2f63e0727de..7cf419786b6e 100644 --- a/sound/pci/atiixp_modem.c +++ b/sound/pci/atiixp_modem.c | |||
@@ -1120,7 +1120,6 @@ static int snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock) | |||
1120 | */ | 1120 | */ |
1121 | static int snd_atiixp_suspend(struct device *dev) | 1121 | static int snd_atiixp_suspend(struct device *dev) |
1122 | { | 1122 | { |
1123 | struct pci_dev *pci = to_pci_dev(dev); | ||
1124 | struct snd_card *card = dev_get_drvdata(dev); | 1123 | struct snd_card *card = dev_get_drvdata(dev); |
1125 | struct atiixp_modem *chip = card->private_data; | 1124 | struct atiixp_modem *chip = card->private_data; |
1126 | int i; | 1125 | int i; |
@@ -1132,29 +1131,15 @@ static int snd_atiixp_suspend(struct device *dev) | |||
1132 | snd_ac97_suspend(chip->ac97[i]); | 1131 | snd_ac97_suspend(chip->ac97[i]); |
1133 | snd_atiixp_aclink_down(chip); | 1132 | snd_atiixp_aclink_down(chip); |
1134 | snd_atiixp_chip_stop(chip); | 1133 | snd_atiixp_chip_stop(chip); |
1135 | |||
1136 | pci_disable_device(pci); | ||
1137 | pci_save_state(pci); | ||
1138 | pci_set_power_state(pci, PCI_D3hot); | ||
1139 | return 0; | 1134 | return 0; |
1140 | } | 1135 | } |
1141 | 1136 | ||
1142 | static int snd_atiixp_resume(struct device *dev) | 1137 | static int snd_atiixp_resume(struct device *dev) |
1143 | { | 1138 | { |
1144 | struct pci_dev *pci = to_pci_dev(dev); | ||
1145 | struct snd_card *card = dev_get_drvdata(dev); | 1139 | struct snd_card *card = dev_get_drvdata(dev); |
1146 | struct atiixp_modem *chip = card->private_data; | 1140 | struct atiixp_modem *chip = card->private_data; |
1147 | int i; | 1141 | int i; |
1148 | 1142 | ||
1149 | pci_set_power_state(pci, PCI_D0); | ||
1150 | pci_restore_state(pci); | ||
1151 | if (pci_enable_device(pci) < 0) { | ||
1152 | dev_err(dev, "pci_enable_device failed, disabling device\n"); | ||
1153 | snd_card_disconnect(card); | ||
1154 | return -EIO; | ||
1155 | } | ||
1156 | pci_set_master(pci); | ||
1157 | |||
1158 | snd_atiixp_aclink_reset(chip); | 1143 | snd_atiixp_aclink_reset(chip); |
1159 | snd_atiixp_chip_start(chip); | 1144 | snd_atiixp_chip_start(chip); |
1160 | 1145 | ||