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

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

ALSA: hda: 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 8b1db4df

sound/pci/hda/hda_intel.c

+0 −13
Original line number Diff line number Diff line
@@ -795,7 +795,6 @@ static int param_set_xint(const char *val, const struct kernel_param *kp) 
 */

static int azx_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct azx *chip;

	struct hda_intel *hda;
@@ -824,9 +823,6 @@ static int azx_suspend(struct device *dev) 


	if (chip->msi)

		pci_disable_msi(chip->pci);

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	if (chip->driver_caps & AZX_DCAPS_I915_POWERWELL)

		hda_display_power(false);

	return 0;
@@ -851,15 +847,6 @@ static int azx_resume(struct device *dev) 
		hda_display_power(true);

		haswell_set_bclk(chip);

	}

	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);

	if (pci_enable_device(pci) < 0) {

		dev_err(chip->card->dev,

			"pci_enable_device failed, disabling device\n");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);

	if (chip->msi)

		if (pci_enable_msi(pci) < 0)

			chip->msi = 0;