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

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

ALSA: ali5451: 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 3db084fd

sound/pci/ali5451/ali5451.c

+0 −15
Original line number Diff line number Diff line
@@ -1873,7 +1873,6 @@ static int snd_ali_mixer(struct snd_ali *codec) 
#ifdef CONFIG_PM_SLEEP

static int ali_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ali *chip = card->private_data;

	struct snd_ali_image *im;
@@ -1914,16 +1913,11 @@ static int ali_suspend(struct device *dev) 
	outl(0xffffffff, ALI_REG(chip, ALI_STOP));



	spin_unlock_irq(&chip->reg_lock);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int ali_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ali *chip = card->private_data;

	struct snd_ali_image *im;
@@ -1933,15 +1927,6 @@ static int ali_resume(struct device *dev) 
	if (!im)

		return 0;



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



	spin_lock_irq(&chip->reg_lock);

	

	for (i = 0; i < ALI_CHANNELS; i++) {