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

Commit 8b1db4df authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: es1968: 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 8c369821

sound/pci/es1968.c

+0 −16
Original line number Diff line number Diff line
@@ -2383,7 +2383,6 @@ static void snd_es1968_start_irq(struct es1968 *chip) 
 */

static int es1968_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct es1968 *chip = card->private_data;
@@ -2396,16 +2395,11 @@ static int es1968_suspend(struct device *dev) 
	snd_pcm_suspend_all(chip->pcm);

	snd_ac97_suspend(chip->ac97);

	snd_es1968_bob_stop(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int es1968_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct es1968 *chip = card->private_data;

	struct esschan *es;
@@ -2413,16 +2407,6 @@ static int es1968_resume(struct device *dev) 
	if (! chip->do_pm)

		return 0;



	/* restore all our config */

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



	snd_es1968_chip_init(chip);



	/* need to restore the base pointers.. */