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/echoaudio | |
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/echoaudio')
-rw-r--r-- | sound/pci/echoaudio/echoaudio.c | 12 | ||||
-rw-r--r-- | sound/pci/echoaudio/echoaudio.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/echoaudio/echoaudio.c b/sound/pci/echoaudio/echoaudio.c index 0ff754f180d0..abb0b86c41c9 100644 --- a/sound/pci/echoaudio/echoaudio.c +++ b/sound/pci/echoaudio/echoaudio.c | |||
@@ -46,7 +46,7 @@ static int get_firmware(const struct firmware **fw_entry, | |||
46 | int err; | 46 | int err; |
47 | char name[30]; | 47 | char name[30]; |
48 | 48 | ||
49 | #ifdef CONFIG_PM | 49 | #ifdef CONFIG_PM_SLEEP |
50 | if (chip->fw_cache[fw_index]) { | 50 | if (chip->fw_cache[fw_index]) { |
51 | DE_ACT(("firmware requested: %s is cached\n", card_fw[fw_index].data)); | 51 | DE_ACT(("firmware requested: %s is cached\n", card_fw[fw_index].data)); |
52 | *fw_entry = chip->fw_cache[fw_index]; | 52 | *fw_entry = chip->fw_cache[fw_index]; |
@@ -59,7 +59,7 @@ static int get_firmware(const struct firmware **fw_entry, | |||
59 | err = request_firmware(fw_entry, name, pci_device(chip)); | 59 | err = request_firmware(fw_entry, name, pci_device(chip)); |
60 | if (err < 0) | 60 | if (err < 0) |
61 | snd_printk(KERN_ERR "get_firmware(): Firmware not available (%d)\n", err); | 61 | snd_printk(KERN_ERR "get_firmware(): Firmware not available (%d)\n", err); |
62 | #ifdef CONFIG_PM | 62 | #ifdef CONFIG_PM_SLEEP |
63 | else | 63 | else |
64 | chip->fw_cache[fw_index] = *fw_entry; | 64 | chip->fw_cache[fw_index] = *fw_entry; |
65 | #endif | 65 | #endif |
@@ -70,7 +70,7 @@ static int get_firmware(const struct firmware **fw_entry, | |||
70 | 70 | ||
71 | static void free_firmware(const struct firmware *fw_entry) | 71 | static void free_firmware(const struct firmware *fw_entry) |
72 | { | 72 | { |
73 | #ifdef CONFIG_PM | 73 | #ifdef CONFIG_PM_SLEEP |
74 | DE_ACT(("firmware not released (kept in cache)\n")); | 74 | DE_ACT(("firmware not released (kept in cache)\n")); |
75 | #else | 75 | #else |
76 | release_firmware(fw_entry); | 76 | release_firmware(fw_entry); |
@@ -82,7 +82,7 @@ static void free_firmware(const struct firmware *fw_entry) | |||
82 | 82 | ||
83 | static void free_firmware_cache(struct echoaudio *chip) | 83 | static void free_firmware_cache(struct echoaudio *chip) |
84 | { | 84 | { |
85 | #ifdef CONFIG_PM | 85 | #ifdef CONFIG_PM_SLEEP |
86 | int i; | 86 | int i; |
87 | 87 | ||
88 | for (i = 0; i < 8 ; i++) | 88 | for (i = 0; i < 8 ; i++) |
@@ -2203,7 +2203,7 @@ ctl_error: | |||
2203 | 2203 | ||
2204 | 2204 | ||
2205 | 2205 | ||
2206 | #if defined(CONFIG_PM) | 2206 | #if defined(CONFIG_PM_SLEEP) |
2207 | 2207 | ||
2208 | static int snd_echo_suspend(struct device *dev) | 2208 | static int snd_echo_suspend(struct device *dev) |
2209 | { | 2209 | { |
@@ -2313,7 +2313,7 @@ static SIMPLE_DEV_PM_OPS(snd_echo_pm, snd_echo_suspend, snd_echo_resume); | |||
2313 | #define SND_ECHO_PM_OPS &snd_echo_pm | 2313 | #define SND_ECHO_PM_OPS &snd_echo_pm |
2314 | #else | 2314 | #else |
2315 | #define SND_ECHO_PM_OPS NULL | 2315 | #define SND_ECHO_PM_OPS NULL |
2316 | #endif /* CONFIG_PM */ | 2316 | #endif /* CONFIG_PM_SLEEP */ |
2317 | 2317 | ||
2318 | 2318 | ||
2319 | static void __devexit snd_echo_remove(struct pci_dev *pci) | 2319 | static void __devexit snd_echo_remove(struct pci_dev *pci) |
diff --git a/sound/pci/echoaudio/echoaudio.h b/sound/pci/echoaudio/echoaudio.h index 1df974dcb5f4..e158369f5faa 100644 --- a/sound/pci/echoaudio/echoaudio.h +++ b/sound/pci/echoaudio/echoaudio.h | |||
@@ -449,7 +449,7 @@ struct echoaudio { | |||
449 | volatile u32 __iomem *dsp_registers; /* DSP's register base */ | 449 | volatile u32 __iomem *dsp_registers; /* DSP's register base */ |
450 | u32 active_mask; /* Chs. active mask or | 450 | u32 active_mask; /* Chs. active mask or |
451 | * punks out */ | 451 | * punks out */ |
452 | #ifdef CONFIG_PM | 452 | #ifdef CONFIG_PM_SLEEP |
453 | const struct firmware *fw_cache[8]; /* Cached firmwares */ | 453 | const struct firmware *fw_cache[8]; /* Cached firmwares */ |
454 | #endif | 454 | #endif |
455 | 455 | ||