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

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

ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP 



Otherwise we may get compile warnings due to unused functions.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7ccbde57

include/sound/emu10k1.h

+2 −2
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ struct snd_emu10k1 { 
	unsigned int efx_voices_mask[2];

	unsigned int next_free_voice;



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	unsigned int *saved_ptr;

	unsigned int *saved_gpr;

	unsigned int *tram_val_saved;
@@ -1856,7 +1856,7 @@ unsigned short snd_emu10k1_ac97_read(struct snd_ac97 *ac97, unsigned short reg); 
void snd_emu10k1_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigned short data);

unsigned int snd_emu10k1_rate_to_pitch(unsigned int rate);



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

void snd_emu10k1_suspend_regs(struct snd_emu10k1 *emu);

void snd_emu10k1_resume_init(struct snd_emu10k1 *emu);

void snd_emu10k1_resume_regs(struct snd_emu10k1 *emu);

sound/pci/ali5451/ali5451.c

+5 −5
Original line number Diff line number Diff line
@@ -270,7 +270,7 @@ struct snd_ali { 
	spinlock_t	reg_lock;

	spinlock_t	voice_alloc;



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	struct snd_ali_image *image;

#endif

};
@@ -1883,7 +1883,7 @@ static int __devinit snd_ali_mixer(struct snd_ali * codec) 
	return 0;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int ali_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);
@@ -1989,7 +1989,7 @@ static SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume); 
#define ALI_PM_OPS	&ali_pm

#else

#define ALI_PM_OPS	NULL

#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static int snd_ali_free(struct snd_ali * codec)

{
@@ -2000,7 +2000,7 @@ static int snd_ali_free(struct snd_ali * codec) 
	if (codec->port)

		pci_release_regions(codec->pci);

	pci_disable_device(codec->pci);

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	kfree(codec->image);

#endif

	pci_dev_put(codec->pci_m1533);
@@ -2232,7 +2232,7 @@ static int __devinit snd_ali_create(struct snd_card *card, 
		return err;

	}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	codec->image = kmalloc(sizeof(*codec->image), GFP_KERNEL);

	if (!codec->image)

		snd_printk(KERN_WARNING "can't allocate apm buffer\n");

sound/pci/als300.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int __devinit snd_als300_create(struct snd_card *card, 
	return 0;

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int snd_als300_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);

sound/pci/als4000.c

+2 −2
Original line number Diff line number Diff line
@@ -987,7 +987,7 @@ static void __devexit snd_card_als4000_remove(struct pci_dev *pci) 
	pci_set_drvdata(pci, NULL);

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int snd_als4000_suspend(struct device *dev)

{

	struct pci_dev *pci = to_pci_dev(dev);
@@ -1040,7 +1040,7 @@ static SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume 
#define SND_ALS4000_PM_OPS	&snd_als4000_pm

#else

#define SND_ALS4000_PM_OPS	NULL

#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static struct pci_driver als4000_driver = {

	.name = KBUILD_MODNAME,

sound/pci/asihpi/asihpi.c

+1 −1
Original line number Diff line number Diff line
@@ -2968,7 +2968,7 @@ static struct pci_driver driver = { 
	.id_table = asihpi_pci_tbl,

	.probe = snd_asihpi_probe,

	.remove = __devexit_p(snd_asihpi_remove),

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

/*	.suspend = snd_asihpi_suspend,

	.resume = snd_asihpi_resume, */

#endif