Commit b8375122 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: cs5535audio: Simplify PM callbacks

This is a similar cleanup like the commit [3db084fd: 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: default avatarTakashi Iwai <tiwai@suse.de>
parent 31918468
...@@ -57,7 +57,6 @@ static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au) ...@@ -57,7 +57,6 @@ static void snd_cs5535audio_stop_hardware(struct cs5535audio *cs5535au)
static int snd_cs5535audio_suspend(struct device *dev) static int snd_cs5535audio_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 cs5535audio *cs5535au = card->private_data; struct cs5535audio *cs5535au = card->private_data;
int i; int i;
...@@ -72,34 +71,17 @@ static int snd_cs5535audio_suspend(struct device *dev) ...@@ -72,34 +71,17 @@ static int snd_cs5535audio_suspend(struct device *dev)
} }
/* save important regs, then disable aclink in hw */ /* save important regs, then disable aclink in hw */
snd_cs5535audio_stop_hardware(cs5535au); snd_cs5535audio_stop_hardware(cs5535au);
if (pci_save_state(pci)) {
dev_err(dev, "pci_save_state failed!\n");
return -EIO;
}
pci_disable_device(pci);
pci_set_power_state(pci, PCI_D3hot);
return 0; return 0;
} }
static int snd_cs5535audio_resume(struct device *dev) static int snd_cs5535audio_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 cs5535audio *cs5535au = card->private_data; struct cs5535audio *cs5535au = card->private_data;
u32 tmp; u32 tmp;
int timeout; int timeout;
int i; int i;
pci_set_power_state(pci, PCI_D0);
pci_restore_state(pci);
if (pci_enable_device(pci) < 0) {
dev_err(dev, "pci_enable_device failed, disabling device\n");
snd_card_disconnect(card);
return -EIO;
}
pci_set_master(pci);
/* set LNK_WRM_RST to reset AC link */ /* set LNK_WRM_RST to reset AC link */
cs_writel(cs5535au, ACC_CODEC_CNTL, ACC_CODEC_CNTL_LNK_WRM_RST); cs_writel(cs5535au, ACC_CODEC_CNTL, ACC_CODEC_CNTL_LNK_WRM_RST);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment