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/emu10k1_main.c | |
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/emu10k1_main.c')
-rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 8 |
1 files changed, 4 insertions, 4 deletions
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, |