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

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

ALSA: als4000: 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 08aa0e34

sound/pci/als4000.c

+0 −15
Original line number Original line Diff line number Diff line
@@ -988,7 +988,6 @@ static void snd_card_als4000_remove(struct pci_dev *pci) 
#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

static int snd_als4000_suspend(struct device *dev)

static int snd_als4000_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 snd_card_als4000 *acard = card->private_data;

	struct snd_card_als4000 *acard = card->private_data;

	struct snd_sb *chip = acard->chip;

	struct snd_sb *chip = acard->chip;
@@ -997,29 +996,15 @@ static int snd_als4000_suspend(struct device *dev) 
	

	

	snd_pcm_suspend_all(chip->pcm);

	snd_pcm_suspend_all(chip->pcm);

	snd_sbmixer_suspend(chip);

	snd_sbmixer_suspend(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

	return 0;

}

}





static int snd_als4000_resume(struct device *dev)

static int snd_als4000_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 snd_card_als4000 *acard = card->private_data;

	struct snd_card_als4000 *acard = card->private_data;

	struct snd_sb *chip = acard->chip;

	struct snd_sb *chip = acard->chip;





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

	snd_als4000_configure(chip);

	snd_sbdsp_reset(chip);

	snd_sbdsp_reset(chip);

	snd_sbmixer_resume(chip);

	snd_sbmixer_resume(chip);