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

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

ALSA: riptide: 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 2d6b2e59

sound/pci/riptide/riptide.c

+0 −14
Original line number Original line Diff line number Diff line
@@ -1153,7 +1153,6 @@ static void riptide_handleirq(unsigned long dev_id) 
#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

static int riptide_suspend(struct device *dev)

static int riptide_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_riptide *chip = card->private_data;

	struct snd_riptide *chip = card->private_data;
@@ -1161,27 +1160,14 @@ static int riptide_suspend(struct device *dev) 
	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	snd_pcm_suspend_all(chip->pcm);

	snd_pcm_suspend_all(chip->pcm);

	snd_ac97_suspend(chip->ac97);

	snd_ac97_suspend(chip->ac97);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

	return 0;

}

}





static int riptide_resume(struct device *dev)

static int riptide_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_riptide *chip = card->private_data;

	struct snd_riptide *chip = card->private_data;





	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		printk(KERN_ERR "riptide: pci_enable_device failed, "

		       "disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);

	snd_riptide_initialize(chip);

	snd_riptide_initialize(chip);

	snd_ac97_resume(chip->ac97);

	snd_ac97_resume(chip->ac97);

	snd_power_change_state(card, SNDRV_CTL_POWER_D0);

	snd_power_change_state(card, SNDRV_CTL_POWER_D0);