Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 31918468 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: cs46xx: 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 faab5223

sound/pci/cs46xx/cs46xx_lib.c

+0 −15
Original line number Diff line number Diff line
@@ -3804,7 +3804,6 @@ static unsigned int saved_regs[] = { 


static int snd_cs46xx_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_cs46xx *chip = card->private_data;

	int i, amp_saved;
@@ -3829,16 +3828,11 @@ static int snd_cs46xx_suspend(struct device *dev) 
	/* disable CLKRUN */

	chip->active_ctrl(chip, -chip->amplifier);

	chip->amplifier = amp_saved; /* restore the status */



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int snd_cs46xx_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_cs46xx *chip = card->private_data;

	int amp_saved;
@@ -3847,15 +3841,6 @@ static int snd_cs46xx_resume(struct device *dev) 
#endif

	unsigned int tmp;



	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);



	amp_saved = chip->amplifier;

	chip->amplifier = 0;

	chip->active_ctrl(chip, 1); /* force to on */