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

Commit 9e594746 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/pci-cleanup' into for-next

parents 624afe4d 3e41c9b5

sound/pci/ali5451/ali5451.c

+0 −15
Original line number Diff line number Diff line
@@ -1873,7 +1873,6 @@ static int snd_ali_mixer(struct snd_ali *codec) 
#ifdef CONFIG_PM_SLEEP

static int ali_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ali *chip = card->private_data;

	struct snd_ali_image *im;
@@ -1914,16 +1913,11 @@ static int ali_suspend(struct device *dev) 
	outl(0xffffffff, ALI_REG(chip, ALI_STOP));



	spin_unlock_irq(&chip->reg_lock);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int ali_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_ali *chip = card->private_data;

	struct snd_ali_image *im;
@@ -1933,15 +1927,6 @@ static int ali_resume(struct device *dev) 
	if (!im)

		return 0;



	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);



	spin_lock_irq(&chip->reg_lock);

	

	for (i = 0; i < ALI_CHANNELS; i++) {

sound/pci/als300.c

+0 −15
Original line number Diff line number Diff line
@@ -728,35 +728,20 @@ static int snd_als300_create(struct snd_card *card, 
#ifdef CONFIG_PM_SLEEP

static int snd_als300_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_als300 *chip = card->private_data;



	snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);

	snd_pcm_suspend_all(chip->pcm);

	snd_ac97_suspend(chip->ac97);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int snd_als300_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_als300 *chip = card->private_data;



	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_als300_init(chip);

	snd_ac97_resume(chip->ac97);

sound/pci/als4000.c

+0 −15
Original line number Diff line number Diff line
@@ -988,7 +988,6 @@ static void snd_card_als4000_remove(struct pci_dev *pci) 
#ifdef CONFIG_PM_SLEEP

static int snd_als4000_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_card_als4000 *acard = card->private_data;

	struct snd_sb *chip = acard->chip;
@@ -997,29 +996,15 @@ static int snd_als4000_suspend(struct device *dev) 
	

	snd_pcm_suspend_all(chip->pcm);

	snd_sbmixer_suspend(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int snd_als4000_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct snd_card_als4000 *acard = card->private_data;

	struct snd_sb *chip = acard->chip;



	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_als4000_configure(chip);

	snd_sbdsp_reset(chip);

	snd_sbmixer_resume(chip);

sound/pci/atiixp.c

+0 −15
Original line number Diff line number Diff line
@@ -1474,7 +1474,6 @@ static int snd_atiixp_mixer_new(struct atiixp *chip, int clock, 
 */

static int snd_atiixp_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct atiixp *chip = card->private_data;

	int i;
@@ -1492,29 +1491,15 @@ static int snd_atiixp_suspend(struct device *dev) 
		snd_ac97_suspend(chip->ac97[i]);

	snd_atiixp_aclink_down(chip);

	snd_atiixp_chip_stop(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int snd_atiixp_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct atiixp *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_atiixp_aclink_reset(chip);

	snd_atiixp_chip_start(chip);

sound/pci/atiixp_modem.c

+0 −15
Original line number Diff line number Diff line
@@ -1120,7 +1120,6 @@ static int snd_atiixp_mixer_new(struct atiixp_modem *chip, int clock) 
 */

static int snd_atiixp_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct atiixp_modem *chip = card->private_data;

	int i;
@@ -1132,29 +1131,15 @@ static int snd_atiixp_suspend(struct device *dev) 
		snd_ac97_suspend(chip->ac97[i]);

	snd_atiixp_aclink_down(chip);

	snd_atiixp_chip_stop(chip);



	pci_disable_device(pci);

	pci_save_state(pci);

	pci_set_power_state(pci, PCI_D3hot);

	return 0;

}



static int snd_atiixp_resume(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct snd_card *card = dev_get_drvdata(dev);

	struct atiixp_modem *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_atiixp_aclink_reset(chip);

	snd_atiixp_chip_start(chip);