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

Commit 2d6b2e59 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: oxygen: 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.

Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fc9b6061

sound/pci/oxygen/oxygen_lib.c

+0 −15
Original line number Diff line number Diff line
@@ -728,7 +728,6 @@ EXPORT_SYMBOL(oxygen_pci_remove); 
#ifdef CONFIG_PM_SLEEP

static int oxygen_pci_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct oxygen *chip = card->private_data;

	unsigned int i, saved_interrupt_mask;
@@ -753,10 +752,6 @@ static int oxygen_pci_suspend(struct device *dev) 
	flush_work(&chip->spdif_input_bits_work);

	flush_work(&chip->gpio_work);

	chip->interrupt_mask = saved_interrupt_mask;



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}
@@ -788,20 +783,10 @@ static void oxygen_restore_ac97(struct oxygen *chip, unsigned int codec) 


static int oxygen_pci_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct oxygen *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, "cannot reenable device");

		snd_card_disconnect(card);

		return -EIO;

	}

	pci_set_master(pci);



	oxygen_write16(chip, OXYGEN_DMA_STATUS, 0);

	oxygen_write16(chip, OXYGEN_INTERRUPT_MASK, 0);

	for (i = 0; i < OXYGEN_IO_SIZE; ++i)