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/maestro3.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/maestro3.c')
-rw-r--r-- | sound/pci/maestro3.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index c85d1ffcc955..eb3cd3a4315e 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c | |||
@@ -789,7 +789,7 @@ struct snd_m3 { | |||
789 | 789 | ||
790 | unsigned int in_suspend; | 790 | unsigned int in_suspend; |
791 | 791 | ||
792 | #ifdef CONFIG_PM | 792 | #ifdef CONFIG_PM_SLEEP |
793 | u16 *suspend_mem; | 793 | u16 *suspend_mem; |
794 | #endif | 794 | #endif |
795 | 795 | ||
@@ -2368,7 +2368,7 @@ static int snd_m3_free(struct snd_m3 *chip) | |||
2368 | outw(0, chip->iobase + HOST_INT_CTRL); /* disable ints */ | 2368 | outw(0, chip->iobase + HOST_INT_CTRL); /* disable ints */ |
2369 | } | 2369 | } |
2370 | 2370 | ||
2371 | #ifdef CONFIG_PM | 2371 | #ifdef CONFIG_PM_SLEEP |
2372 | vfree(chip->suspend_mem); | 2372 | vfree(chip->suspend_mem); |
2373 | #endif | 2373 | #endif |
2374 | 2374 | ||
@@ -2390,7 +2390,7 @@ static int snd_m3_free(struct snd_m3 *chip) | |||
2390 | /* | 2390 | /* |
2391 | * APM support | 2391 | * APM support |
2392 | */ | 2392 | */ |
2393 | #ifdef CONFIG_PM | 2393 | #ifdef CONFIG_PM_SLEEP |
2394 | static int m3_suspend(struct device *dev) | 2394 | static int m3_suspend(struct device *dev) |
2395 | { | 2395 | { |
2396 | struct pci_dev *pci = to_pci_dev(dev); | 2396 | struct pci_dev *pci = to_pci_dev(dev); |
@@ -2485,7 +2485,7 @@ static SIMPLE_DEV_PM_OPS(m3_pm, m3_suspend, m3_resume); | |||
2485 | #define M3_PM_OPS &m3_pm | 2485 | #define M3_PM_OPS &m3_pm |
2486 | #else | 2486 | #else |
2487 | #define M3_PM_OPS NULL | 2487 | #define M3_PM_OPS NULL |
2488 | #endif /* CONFIG_PM */ | 2488 | #endif /* CONFIG_PM_SLEEP */ |
2489 | 2489 | ||
2490 | #ifdef CONFIG_SND_MAESTRO3_INPUT | 2490 | #ifdef CONFIG_SND_MAESTRO3_INPUT |
2491 | static int __devinit snd_m3_input_register(struct snd_m3 *chip) | 2491 | static int __devinit snd_m3_input_register(struct snd_m3 *chip) |
@@ -2656,7 +2656,7 @@ snd_m3_create(struct snd_card *card, struct pci_dev *pci, | |||
2656 | } | 2656 | } |
2657 | chip->irq = pci->irq; | 2657 | chip->irq = pci->irq; |
2658 | 2658 | ||
2659 | #ifdef CONFIG_PM | 2659 | #ifdef CONFIG_PM_SLEEP |
2660 | chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH)); | 2660 | chip->suspend_mem = vmalloc(sizeof(u16) * (REV_B_CODE_MEMORY_LENGTH + REV_B_DATA_MEMORY_LENGTH)); |
2661 | if (chip->suspend_mem == NULL) | 2661 | if (chip->suspend_mem == NULL) |
2662 | snd_printk(KERN_WARNING "can't allocate apm buffer\n"); | 2662 | snd_printk(KERN_WARNING "can't allocate apm buffer\n"); |