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

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

ALSA: echoaudio: 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 7247aabd

sound/pci/echoaudio/echoaudio.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -2162,7 +2162,6 @@ static int snd_echo_probe(struct pci_dev *pci, 




static int snd_echo_suspend(struct device *dev)

static int snd_echo_suspend(struct device *dev)

{

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct echoaudio *chip = dev_get_drvdata(dev);

	struct echoaudio *chip = dev_get_drvdata(dev);





	snd_pcm_suspend_all(chip->analog_pcm);

	snd_pcm_suspend_all(chip->analog_pcm);
@@ -2188,9 +2187,6 @@ static int snd_echo_suspend(struct device *dev) 
	chip->dsp_code = NULL;

	chip->dsp_code = NULL;

	free_irq(chip->irq, chip);

	free_irq(chip->irq, chip);

	chip->irq = -1;

	chip->irq = -1;

	pci_save_state(pci);

	pci_disable_device(pci);



	return 0;

	return 0;

}

}
@@ -2204,7 +2200,6 @@ static int snd_echo_resume(struct device *dev) 
	u32 pipe_alloc_mask;

	u32 pipe_alloc_mask;

	int err;

	int err;





	pci_restore_state(pci);

	commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);

	commpage_bak = kmalloc(sizeof(struct echoaudio), GFP_KERNEL);

	if (commpage_bak == NULL)

	if (commpage_bak == NULL)

		return -ENOMEM;

		return -ENOMEM;