Commit 3e41c9b5 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ymfpci: 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 de0c869c

sound/pci/ymfpci/ymfpci_main.c

+0 −12
Original line number Diff line number Diff line
@@ -2326,7 +2326,6 @@ static int saved_regs_index[] = { 


static int snd_ymfpci_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ymfpci *chip = card->private_data;

	unsigned int i;
@@ -2347,9 +2346,6 @@ static int snd_ymfpci_suspend(struct device *dev) 
	snd_ymfpci_writel(chip, YDSXGR_NATIVEDACOUTVOL, 0);

	snd_ymfpci_writel(chip, YDSXGR_BUF441OUTVOL, 0);

	snd_ymfpci_disable_dsp(chip);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}
@@ -2360,14 +2356,6 @@ static int snd_ymfpci_resume(struct device *dev) 
	struct snd_ymfpci *chip = card->private_data;

	unsigned int i;



	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_ymfpci_aclink_reset(pci);

	snd_ymfpci_codec_ready(chip, 0);

	snd_ymfpci_download_image(chip);

CRA Git | Maintained and supported by SUSTech CRA and CCSE