aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712
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/ice1712
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/ice1712')
-rw-r--r--sound/pci/ice1712/aureon.c4
-rw-r--r--sound/pci/ice1712/ice1712.h2
-rw-r--r--sound/pci/ice1712/ice1724.c4
-rw-r--r--sound/pci/ice1712/juli.c4
-rw-r--r--sound/pci/ice1712/prodigy_hifi.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c
index 3e4f8c12ffce..20bcddea2eab 100644
--- a/sound/pci/ice1712/aureon.c
+++ b/sound/pci/ice1712/aureon.c
@@ -2103,7 +2103,7 @@ static int aureon_reset(struct snd_ice1712 *ice)
2103/* 2103/*
2104 * suspend/resume 2104 * suspend/resume
2105 */ 2105 */
2106#ifdef CONFIG_PM 2106#ifdef CONFIG_PM_SLEEP
2107static int aureon_resume(struct snd_ice1712 *ice) 2107static int aureon_resume(struct snd_ice1712 *ice)
2108{ 2108{
2109 struct aureon_spec *spec = ice->spec; 2109 struct aureon_spec *spec = ice->spec;
@@ -2160,7 +2160,7 @@ static int __devinit aureon_init(struct snd_ice1712 *ice)
2160 wm_set_vol(ice, i, spec->vol[i], spec->master[i % 2]); 2160 wm_set_vol(ice, i, spec->vol[i], spec->master[i % 2]);
2161 } 2161 }
2162 2162
2163#ifdef CONFIG_PM 2163#ifdef CONFIG_PM_SLEEP
2164 ice->pm_resume = aureon_resume; 2164 ice->pm_resume = aureon_resume;
2165 ice->pm_suspend_enabled = 1; 2165 ice->pm_suspend_enabled = 1;
2166#endif 2166#endif
diff --git a/sound/pci/ice1712/ice1712.h b/sound/pci/ice1712/ice1712.h
index 0da778a69ef8..d0e7d87f09f0 100644
--- a/sound/pci/ice1712/ice1712.h
+++ b/sound/pci/ice1712/ice1712.h
@@ -384,7 +384,7 @@ struct snd_ice1712 {
384 char **ext_clock_names; 384 char **ext_clock_names;
385 int ext_clock_count; 385 int ext_clock_count;
386 void (*pro_open)(struct snd_ice1712 *, struct snd_pcm_substream *); 386 void (*pro_open)(struct snd_ice1712 *, struct snd_pcm_substream *);
387#ifdef CONFIG_PM 387#ifdef CONFIG_PM_SLEEP
388 int (*pm_suspend)(struct snd_ice1712 *); 388 int (*pm_suspend)(struct snd_ice1712 *);
389 int (*pm_resume)(struct snd_ice1712 *); 389 int (*pm_resume)(struct snd_ice1712 *);
390 unsigned int pm_suspend_enabled:1; 390 unsigned int pm_suspend_enabled:1;
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index bed9f34f4efe..3050a5279253 100644
--- a/sound/pci/ice1712/ice1724.c
+++ b/sound/pci/ice1712/ice1724.c
@@ -2792,7 +2792,7 @@ static void __devexit snd_vt1724_remove(struct pci_dev *pci)
2792 pci_set_drvdata(pci, NULL); 2792 pci_set_drvdata(pci, NULL);
2793} 2793}
2794 2794
2795#ifdef CONFIG_PM 2795#ifdef CONFIG_PM_SLEEP
2796static int snd_vt1724_suspend(struct device *dev) 2796static int snd_vt1724_suspend(struct device *dev)
2797{ 2797{
2798 struct pci_dev *pci = to_pci_dev(dev); 2798 struct pci_dev *pci = to_pci_dev(dev);
@@ -2878,7 +2878,7 @@ static SIMPLE_DEV_PM_OPS(snd_vt1724_pm, snd_vt1724_suspend, snd_vt1724_resume);
2878#define SND_VT1724_PM_OPS &snd_vt1724_pm 2878#define SND_VT1724_PM_OPS &snd_vt1724_pm
2879#else 2879#else
2880#define SND_VT1724_PM_OPS NULL 2880#define SND_VT1724_PM_OPS NULL
2881#endif /* CONFIG_PM */ 2881#endif /* CONFIG_PM_SLEEP */
2882 2882
2883static struct pci_driver vt1724_driver = { 2883static struct pci_driver vt1724_driver = {
2884 .name = KBUILD_MODNAME, 2884 .name = KBUILD_MODNAME,
diff --git a/sound/pci/ice1712/juli.c b/sound/pci/ice1712/juli.c
index 98bc3b7681b5..14fd536b6452 100644
--- a/sound/pci/ice1712/juli.c
+++ b/sound/pci/ice1712/juli.c
@@ -486,7 +486,7 @@ static int __devinit juli_add_controls(struct snd_ice1712 *ice)
486 * suspend/resume 486 * suspend/resume
487 * */ 487 * */
488 488
489#ifdef CONFIG_PM 489#ifdef CONFIG_PM_SLEEP
490static int juli_resume(struct snd_ice1712 *ice) 490static int juli_resume(struct snd_ice1712 *ice)
491{ 491{
492 struct snd_akm4xxx *ak = ice->akm; 492 struct snd_akm4xxx *ak = ice->akm;
@@ -652,7 +652,7 @@ static int __devinit juli_init(struct snd_ice1712 *ice)
652 652
653 ice->spdif.ops.open = juli_spdif_in_open; 653 ice->spdif.ops.open = juli_spdif_in_open;
654 654
655#ifdef CONFIG_PM 655#ifdef CONFIG_PM_SLEEP
656 ice->pm_resume = juli_resume; 656 ice->pm_resume = juli_resume;
657 ice->pm_suspend = juli_suspend; 657 ice->pm_suspend = juli_suspend;
658 ice->pm_suspend_enabled = 1; 658 ice->pm_suspend_enabled = 1;
diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
index 764cc93dbca4..7f2b63f97e61 100644
--- a/sound/pci/ice1712/prodigy_hifi.c
+++ b/sound/pci/ice1712/prodigy_hifi.c
@@ -1099,7 +1099,7 @@ static void ak4396_init(struct snd_ice1712 *ice)
1099 ak4396_write(ice, ak4396_inits[i], ak4396_inits[i+1]); 1099 ak4396_write(ice, ak4396_inits[i], ak4396_inits[i+1]);
1100} 1100}
1101 1101
1102#ifdef CONFIG_PM 1102#ifdef CONFIG_PM_SLEEP
1103static int prodigy_hd2_resume(struct snd_ice1712 *ice) 1103static int prodigy_hd2_resume(struct snd_ice1712 *ice)
1104{ 1104{
1105 /* initialize ak4396 codec and restore previous mixer volumes */ 1105 /* initialize ak4396 codec and restore previous mixer volumes */
@@ -1140,7 +1140,7 @@ static int __devinit prodigy_hd2_init(struct snd_ice1712 *ice)
1140 return -ENOMEM; 1140 return -ENOMEM;
1141 ice->spec = spec; 1141 ice->spec = spec;
1142 1142
1143#ifdef CONFIG_PM 1143#ifdef CONFIG_PM_SLEEP
1144 ice->pm_resume = &prodigy_hd2_resume; 1144 ice->pm_resume = &prodigy_hd2_resume;
1145 ice->pm_suspend_enabled = 1; 1145 ice->pm_suspend_enabled = 1;
1146#endif 1146#endif