aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ali5451/ali5451.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-14 12:12:04 -0400
committerTakashi Iwai <tiwai@suse.de>2012-08-14 12:12:04 -0400
commitc7561cd80469f2fe4a6be0984db57832ee7f2a3b (patch)
tree02ce843b7caed4d41ef6d17450e6b05b96c94952 /sound/pci/ali5451/ali5451.c
parent7ccbde57ce312ff1388c2990699f8863280808ac (diff)
ALSA: PCI: Replace CONFIG_PM with CONFIG_PM_SLEEP
Otherwise we may get compile warnings due to unused functions. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ali5451/ali5451.c')
-rw-r--r--sound/pci/ali5451/ali5451.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index ee895f3c8605..c7e3c533316e 100644
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -270,7 +270,7 @@ struct snd_ali {
270 spinlock_t reg_lock; 270 spinlock_t reg_lock;
271 spinlock_t voice_alloc; 271 spinlock_t voice_alloc;
272 272
273#ifdef CONFIG_PM 273#ifdef CONFIG_PM_SLEEP
274 struct snd_ali_image *image; 274 struct snd_ali_image *image;
275#endif 275#endif
276}; 276};
@@ -1883,7 +1883,7 @@ static int __devinit snd_ali_mixer(struct snd_ali * codec)
1883 return 0; 1883 return 0;
1884} 1884}
1885 1885
1886#ifdef CONFIG_PM 1886#ifdef CONFIG_PM_SLEEP
1887static int ali_suspend(struct device *dev) 1887static int ali_suspend(struct device *dev)
1888{ 1888{
1889 struct pci_dev *pci = to_pci_dev(dev); 1889 struct pci_dev *pci = to_pci_dev(dev);
@@ -1989,7 +1989,7 @@ static SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume);
1989#define ALI_PM_OPS &ali_pm 1989#define ALI_PM_OPS &ali_pm
1990#else 1990#else
1991#define ALI_PM_OPS NULL 1991#define ALI_PM_OPS NULL
1992#endif /* CONFIG_PM */ 1992#endif /* CONFIG_PM_SLEEP */
1993 1993
1994static int snd_ali_free(struct snd_ali * codec) 1994static int snd_ali_free(struct snd_ali * codec)
1995{ 1995{
@@ -2000,7 +2000,7 @@ static int snd_ali_free(struct snd_ali * codec)
2000 if (codec->port) 2000 if (codec->port)
2001 pci_release_regions(codec->pci); 2001 pci_release_regions(codec->pci);
2002 pci_disable_device(codec->pci); 2002 pci_disable_device(codec->pci);
2003#ifdef CONFIG_PM 2003#ifdef CONFIG_PM_SLEEP
2004 kfree(codec->image); 2004 kfree(codec->image);
2005#endif 2005#endif
2006 pci_dev_put(codec->pci_m1533); 2006 pci_dev_put(codec->pci_m1533);
@@ -2232,7 +2232,7 @@ static int __devinit snd_ali_create(struct snd_card *card,
2232 return err; 2232 return err;
2233 } 2233 }
2234 2234
2235#ifdef CONFIG_PM 2235#ifdef CONFIG_PM_SLEEP
2236 codec->image = kmalloc(sizeof(*codec->image), GFP_KERNEL); 2236 codec->image = kmalloc(sizeof(*codec->image), GFP_KERNEL);
2237 if (!codec->image) 2237 if (!codec->image)
2238 snd_printk(KERN_WARNING "can't allocate apm buffer\n"); 2238 snd_printk(KERN_WARNING "can't allocate apm buffer\n");