iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALSA: ice1712: Simplify PM callbacks

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2015-01-08 12:47:55 +01:00
parent e2a711f1b5
commit b60dc62f5b
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/ice1712/ice1712.c
View File

@ -2798,7 +2798,6 @@ static void snd_ice1712_remove(struct pci_dev *pci)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int snd_ice1712_suspend(struct device *dev) static int snd_ice1712_suspend(struct device *dev)
{ {
struct pci_dev *pci = to_pci_dev(dev);
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
struct snd_ice1712 *ice = card->private_data; struct snd_ice1712 *ice = card->private_data;
@ -2820,16 +2819,11 @@ static int snd_ice1712_suspend(struct device *dev)
if (ice->pm_suspend) if (ice->pm_suspend)
ice->pm_suspend(ice); ice->pm_suspend(ice);
pci_disable_device(pci);
pci_save_state(pci);
pci_set_power_state(pci, PCI_D3hot);
return 0; return 0;
} }
static int snd_ice1712_resume(struct device *dev) static int snd_ice1712_resume(struct device *dev)
{ {
struct pci_dev *pci = to_pci_dev(dev);
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
struct snd_ice1712 *ice = card->private_data; struct snd_ice1712 *ice = card->private_data;
int rate; int rate;
@ -2837,16 +2831,6 @@ static int snd_ice1712_resume(struct device *dev)
if (!ice->pm_suspend_enabled) if (!ice->pm_suspend_enabled)
return 0; return 0;
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
if (pci_enable_device(pci) < 0) {
snd_card_disconnect(card);
return -EIO;
}
pci_set_master(pci);
if (ice->cur_rate) if (ice->cur_rate)
rate = ice->cur_rate; rate = ice->cur_rate;
else else