ALSA: cs4281: 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>
This commit is contained in:
Родитель
5762fdb5f9
Коммит
faab522393
|
@ -2008,7 +2008,6 @@ static int saved_regs[SUSPEND_REGISTERS] = {
|
|||
|
||||
static int cs4281_suspend(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pci = to_pci_dev(dev);
|
||||
struct snd_card *card = dev_get_drvdata(dev);
|
||||
struct cs4281 *chip = card->private_data;
|
||||
u32 ulCLK;
|
||||
|
@ -2047,30 +2046,16 @@ static int cs4281_suspend(struct device *dev)
|
|||
ulCLK = snd_cs4281_peekBA0(chip, BA0_CLKCR1);
|
||||
ulCLK &= ~CLKCR1_CKRA;
|
||||
snd_cs4281_pokeBA0(chip, BA0_CLKCR1, ulCLK);
|
||||
|
||||
pci_disable_device(pci);
|
||||
pci_save_state(pci);
|
||||
pci_set_power_state(pci, PCI_D3hot);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cs4281_resume(struct device *dev)
|
||||
{
|
||||
struct pci_dev *pci = to_pci_dev(dev);
|
||||
struct snd_card *card = dev_get_drvdata(dev);
|
||||
struct cs4281 *chip = card->private_data;
|
||||
unsigned int i;
|
||||
u32 ulCLK;
|
||||
|
||||
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);
|
||||
|
||||
ulCLK = snd_cs4281_peekBA0(chip, BA0_CLKCR1);
|
||||
ulCLK |= CLKCR1_CKRA;
|
||||
snd_cs4281_pokeBA0(chip, BA0_CLKCR1, ulCLK);
|
||||
|
|
Загрузка…
Ссылка в новой задаче