diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-01-08 06:47:55 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-01-09 10:24:22 -0500 |
commit | b60dc62f5b078222e895aae21b71da968ae101a8 (patch) | |
tree | 53d5b58f60eaa5317e46b8dcae948e137e5d56d2 /sound/pci | |
parent | e2a711f1b59d59e95f58d1e32e5fbcb7a7a28217 (diff) |
ALSA: ice1712: 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')
-rw-r--r-- | sound/pci/ice1712/ice1712.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/sound/pci/ice1712/ice1712.c b/sound/pci/ice1712/ice1712.c index b039b46152c6..e1560bf0d26a 100644 --- a/sound/pci/ice1712/ice1712.c +++ b/sound/pci/ice1712/ice1712.c | |||
@@ -2798,7 +2798,6 @@ static void snd_ice1712_remove(struct pci_dev *pci) | |||
2798 | #ifdef CONFIG_PM_SLEEP | 2798 | #ifdef CONFIG_PM_SLEEP |
2799 | static int snd_ice1712_suspend(struct device *dev) | 2799 | static int snd_ice1712_suspend(struct device *dev) |
2800 | { | 2800 | { |
2801 | struct pci_dev *pci = to_pci_dev(dev); | ||
2802 | struct snd_card *card = dev_get_drvdata(dev); | 2801 | struct snd_card *card = dev_get_drvdata(dev); |
2803 | struct snd_ice1712 *ice = card->private_data; | 2802 | struct snd_ice1712 *ice = card->private_data; |
2804 | 2803 | ||
@@ -2820,16 +2819,11 @@ static int snd_ice1712_suspend(struct device *dev) | |||
2820 | 2819 | ||
2821 | if (ice->pm_suspend) | 2820 | if (ice->pm_suspend) |
2822 | ice->pm_suspend(ice); | 2821 | ice->pm_suspend(ice); |
2823 | |||
2824 | pci_disable_device(pci); | ||
2825 | pci_save_state(pci); | ||
2826 | pci_set_power_state(pci, PCI_D3hot); | ||
2827 | return 0; | 2822 | return 0; |
2828 | } | 2823 | } |
2829 | 2824 | ||
2830 | static int snd_ice1712_resume(struct device *dev) | 2825 | static int snd_ice1712_resume(struct device *dev) |
2831 | { | 2826 | { |
2832 | struct pci_dev *pci = to_pci_dev(dev); | ||
2833 | struct snd_card *card = dev_get_drvdata(dev); | 2827 | struct snd_card *card = dev_get_drvdata(dev); |
2834 | struct snd_ice1712 *ice = card->private_data; | 2828 | struct snd_ice1712 *ice = card->private_data; |
2835 | int rate; | 2829 | int rate; |
@@ -2837,16 +2831,6 @@ static int snd_ice1712_resume(struct device *dev) | |||
2837 | if (!ice->pm_suspend_enabled) | 2831 | if (!ice->pm_suspend_enabled) |
2838 | return 0; | 2832 | return 0; |
2839 | 2833 | ||
2840 | pci_set_power_state(pci, PCI_D0); | ||
2841 | pci_restore_state(pci); | ||
2842 | |||
2843 | if (pci_enable_device(pci) < 0) { | ||
2844 | snd_card_disconnect(card); | ||
2845 | return -EIO; | ||
2846 | } | ||
2847 | |||
2848 | pci_set_master(pci); | ||
2849 | |||
2850 | if (ice->cur_rate) | 2834 | if (ice->cur_rate) |
2851 | rate = ice->cur_rate; | 2835 | rate = ice->cur_rate; |
2852 | else | 2836 | else |