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

Commit 8c369821 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: es1938: 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 943cf283

sound/pci/es1938.c

+0 −12
Original line number Diff line number Diff line
@@ -1454,7 +1454,6 @@ static unsigned char saved_regs[SAVED_REG_SIZE+1] = { 


static int es1938_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct es1938 *chip = card->private_data;

	unsigned char *s, *d;
@@ -1471,9 +1470,6 @@ static int es1938_suspend(struct device *dev) 
		free_irq(chip->irq, chip);

		chip->irq = -1;

	}

	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}
@@ -1484,14 +1480,6 @@ static int es1938_resume(struct device *dev) 
	struct es1938 *chip = card->private_data;

	unsigned char *s, *d;



	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;

	}



	if (request_irq(pci->irq, snd_es1938_interrupt,

			IRQF_SHARED, KBUILD_MODNAME, chip)) {

		dev_err(dev, "unable to grab IRQ %d, disabling device\n",