diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-14 12:12:04 -0400 |
commit | c7561cd80469f2fe4a6be0984db57832ee7f2a3b (patch) | |
tree | 02ce843b7caed4d41ef6d17450e6b05b96c94952 /sound/pci/emu10k1 | |
parent | 7ccbde57ce312ff1388c2990699f8863280808ac (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/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emu10k1.c | 4 | ||||
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 8 | ||||
-rw-r--r-- | sound/pci/emu10k1/emufx.c | 2 | ||||
-rw-r--r-- | sound/pci/emu10k1/p16v.c | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sound/pci/emu10k1/emu10k1.c b/sound/pci/emu10k1/emu10k1.c index ddac4e6d660d..b7c1875ba90e 100644 --- a/sound/pci/emu10k1/emu10k1.c +++ b/sound/pci/emu10k1/emu10k1.c | |||
@@ -206,7 +206,7 @@ static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci) | |||
206 | } | 206 | } |
207 | 207 | ||
208 | 208 | ||
209 | #ifdef CONFIG_PM | 209 | #ifdef CONFIG_PM_SLEEP |
210 | static int snd_emu10k1_suspend(struct device *dev) | 210 | static int snd_emu10k1_suspend(struct device *dev) |
211 | { | 211 | { |
212 | struct pci_dev *pci = to_pci_dev(dev); | 212 | struct pci_dev *pci = to_pci_dev(dev); |
@@ -268,7 +268,7 @@ static SIMPLE_DEV_PM_OPS(snd_emu10k1_pm, snd_emu10k1_suspend, snd_emu10k1_resume | |||
268 | #define SND_EMU10K1_PM_OPS &snd_emu10k1_pm | 268 | #define SND_EMU10K1_PM_OPS &snd_emu10k1_pm |
269 | #else | 269 | #else |
270 | #define SND_EMU10K1_PM_OPS NULL | 270 | #define SND_EMU10K1_PM_OPS NULL |
271 | #endif /* CONFIG_PM */ | 271 | #endif /* CONFIG_PM_SLEEP */ |
272 | 272 | ||
273 | static struct pci_driver emu10k1_driver = { | 273 | static struct pci_driver emu10k1_driver = { |
274 | .name = KBUILD_MODNAME, | 274 | .name = KBUILD_MODNAME, |
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 754924081d0a..bed4485f34f6 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c | |||
@@ -1241,7 +1241,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) | |||
1241 | * Create the EMU10K1 instance | 1241 | * Create the EMU10K1 instance |
1242 | */ | 1242 | */ |
1243 | 1243 | ||
1244 | #ifdef CONFIG_PM | 1244 | #ifdef CONFIG_PM_SLEEP |
1245 | static int alloc_pm_buffer(struct snd_emu10k1 *emu); | 1245 | static int alloc_pm_buffer(struct snd_emu10k1 *emu); |
1246 | static void free_pm_buffer(struct snd_emu10k1 *emu); | 1246 | static void free_pm_buffer(struct snd_emu10k1 *emu); |
1247 | #endif | 1247 | #endif |
@@ -1275,7 +1275,7 @@ static int snd_emu10k1_free(struct snd_emu10k1 *emu) | |||
1275 | snd_dma_free_pages(&emu->ptb_pages); | 1275 | snd_dma_free_pages(&emu->ptb_pages); |
1276 | vfree(emu->page_ptr_table); | 1276 | vfree(emu->page_ptr_table); |
1277 | vfree(emu->page_addr_table); | 1277 | vfree(emu->page_addr_table); |
1278 | #ifdef CONFIG_PM | 1278 | #ifdef CONFIG_PM_SLEEP |
1279 | free_pm_buffer(emu); | 1279 | free_pm_buffer(emu); |
1280 | #endif | 1280 | #endif |
1281 | if (emu->port) | 1281 | if (emu->port) |
@@ -1971,7 +1971,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
1971 | err = snd_emu10k1_init(emu, enable_ir, 0); | 1971 | err = snd_emu10k1_init(emu, enable_ir, 0); |
1972 | if (err < 0) | 1972 | if (err < 0) |
1973 | goto error; | 1973 | goto error; |
1974 | #ifdef CONFIG_PM | 1974 | #ifdef CONFIG_PM_SLEEP |
1975 | err = alloc_pm_buffer(emu); | 1975 | err = alloc_pm_buffer(emu); |
1976 | if (err < 0) | 1976 | if (err < 0) |
1977 | goto error; | 1977 | goto error; |
@@ -2000,7 +2000,7 @@ int __devinit snd_emu10k1_create(struct snd_card *card, | |||
2000 | return err; | 2000 | return err; |
2001 | } | 2001 | } |
2002 | 2002 | ||
2003 | #ifdef CONFIG_PM | 2003 | #ifdef CONFIG_PM_SLEEP |
2004 | static unsigned char saved_regs[] = { | 2004 | static unsigned char saved_regs[] = { |
2005 | CPF, PTRX, CVCF, VTFT, Z1, Z2, PSST, DSL, CCCA, CCR, CLP, | 2005 | CPF, PTRX, CVCF, VTFT, Z1, Z2, PSST, DSL, CCCA, CCR, CLP, |
2006 | FXRT, MAPA, MAPB, ENVVOL, ATKHLDV, DCYSUSV, LFOVAL1, ENVVAL, | 2006 | FXRT, MAPA, MAPB, ENVVOL, ATKHLDV, DCYSUSV, LFOVAL1, ENVVAL, |
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c index dae4050ede5c..52419959178c 100644 --- a/sound/pci/emu10k1/emufx.c +++ b/sound/pci/emu10k1/emufx.c | |||
@@ -2646,7 +2646,7 @@ int __devinit snd_emu10k1_fx8010_new(struct snd_emu10k1 *emu, int device, struct | |||
2646 | return 0; | 2646 | return 0; |
2647 | } | 2647 | } |
2648 | 2648 | ||
2649 | #ifdef CONFIG_PM | 2649 | #ifdef CONFIG_PM_SLEEP |
2650 | int __devinit snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu) | 2650 | int __devinit snd_emu10k1_efx_alloc_pm_buffer(struct snd_emu10k1 *emu) |
2651 | { | 2651 | { |
2652 | int len; | 2652 | int len; |
diff --git a/sound/pci/emu10k1/p16v.c b/sound/pci/emu10k1/p16v.c index a81dc44228ea..88cec6b7dd41 100644 --- a/sound/pci/emu10k1/p16v.c +++ b/sound/pci/emu10k1/p16v.c | |||
@@ -893,7 +893,7 @@ int __devinit snd_p16v_mixer(struct snd_emu10k1 *emu) | |||
893 | return 0; | 893 | return 0; |
894 | } | 894 | } |
895 | 895 | ||
896 | #ifdef CONFIG_PM | 896 | #ifdef CONFIG_PM_SLEEP |
897 | 897 | ||
898 | #define NUM_CHS 1 /* up to 4, but only first channel is used */ | 898 | #define NUM_CHS 1 /* up to 4, but only first channel is used */ |
899 | 899 | ||