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

Commit 11afa642 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: ca0106: 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 3a7ed369

sound/pci/ca0106/ca0106_main.c

+0 −16
Original line number Original line Diff line number Diff line
@@ -1910,7 +1910,6 @@ static void snd_ca0106_remove(struct pci_dev *pci) 
#ifdef CONFIG_PM_SLEEP

#ifdef CONFIG_PM_SLEEP

static int snd_ca0106_suspend(struct device *dev)

static int snd_ca0106_suspend(struct device *dev)

{

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ca0106 *chip = card->private_data;

	struct snd_ca0106 *chip = card->private_data;

	int i;

	int i;
@@ -1923,30 +1922,15 @@ static int snd_ca0106_suspend(struct device *dev) 
	snd_ca0106_mixer_suspend(chip);

	snd_ca0106_mixer_suspend(chip);





	ca0106_stop_chip(chip);

	ca0106_stop_chip(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

	return 0;

}

}





static int snd_ca0106_resume(struct device *dev)

static int snd_ca0106_resume(struct device *dev)

{

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ca0106 *chip = card->private_data;

	struct snd_ca0106 *chip = card->private_data;

	int i;

	int i;





	pci_set_power_state(pci, PCI_D0);

	pci_restore_state(pci);



	if (pci_enable_device(pci) < 0) {

		snd_card_disconnect(card);

		return -EIO;

	}



	pci_set_master(pci);



	ca0106_init_chip(chip, 1);

	ca0106_init_chip(chip, 1);





	if (chip->details->ac97)

	if (chip->details->ac97)