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

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

ALSA: intel8x0: 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 88942503

sound/pci/intel8x0.c

+0 −15
Original line number Diff line number Diff line
@@ -2654,7 +2654,6 @@ static int snd_intel8x0_free(struct intel8x0 *chip) 
 */

static int intel8x0_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct intel8x0 *chip = card->private_data;

	int i;
@@ -2682,12 +2681,6 @@ static int intel8x0_suspend(struct device *dev) 
		free_irq(chip->irq, chip);

		chip->irq = -1;

	}

	pci_disable_device(pci);

	pci_save_state(pci);

	/* The call below may disable built-in speaker on some laptops

	 * after S2RAM.  So, don't touch it.

	 */

	/* pci_set_power_state(pci, PCI_D3hot); */

	return 0;

}
@@ -2698,14 +2691,6 @@ static int intel8x0_resume(struct device *dev) 
	struct intel8x0 *chip = card->private_data;

	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_intel8x0_chip_init(chip, 0);

	if (request_irq(pci->irq, snd_intel8x0_interrupt,

			IRQF_SHARED, KBUILD_MODNAME, chip)) {