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

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

ALSA: nm256: 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 cd86f459

sound/pci/nm256/nm256.c

+0 −14
Original line number Diff line number Diff line
@@ -1392,7 +1392,6 @@ snd_nm256_peek_for_sig(struct nm256 *chip) 
 */

static int nm256_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct nm256 *chip = card->private_data;
@@ -1400,15 +1399,11 @@ static int nm256_suspend(struct device *dev) 
	snd_pcm_suspend_all(chip->pcm);

	snd_ac97_suspend(chip->ac97);

	chip->coeffs_current = 0;

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int nm256_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct nm256 *chip = card->private_data;

	int i;
@@ -1416,15 +1411,6 @@ static int nm256_resume(struct device *dev) 
	/* Perform a full reset on the hardware */

	chip->in_resume = 1;



	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_nm256_init_chip(chip);



	/* restore ac97 */