aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ymfpci
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/ymfpci
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/ymfpci')
-rw-r--r--sound/pci/ymfpci/ymfpci.c2
-rw-r--r--sound/pci/ymfpci/ymfpci.h2
-rw-r--r--sound/pci/ymfpci/ymfpci_main.c8
3 files changed, 6 insertions, 6 deletions
diff --git a/sound/pci/ymfpci/ymfpci.c b/sound/pci/ymfpci/ymfpci.c
index 4810356b97ba..e01fe34db9ec 100644
--- a/sound/pci/ymfpci/ymfpci.c
+++ b/sound/pci/ymfpci/ymfpci.c
@@ -355,7 +355,7 @@ static struct pci_driver ymfpci_driver = {
355 .id_table = snd_ymfpci_ids, 355 .id_table = snd_ymfpci_ids,
356 .probe = snd_card_ymfpci_probe, 356 .probe = snd_card_ymfpci_probe,
357 .remove = __devexit_p(snd_card_ymfpci_remove), 357 .remove = __devexit_p(snd_card_ymfpci_remove),
358#ifdef CONFIG_PM 358#ifdef CONFIG_PM_SLEEP
359 .driver = { 359 .driver = {
360 .pm = &snd_ymfpci_pm, 360 .pm = &snd_ymfpci_pm,
361 }, 361 },
diff --git a/sound/pci/ymfpci/ymfpci.h b/sound/pci/ymfpci/ymfpci.h
index bddc4052286b..4631a2348915 100644
--- a/sound/pci/ymfpci/ymfpci.h
+++ b/sound/pci/ymfpci/ymfpci.h
@@ -363,7 +363,7 @@ struct snd_ymfpci {
363 const struct firmware *dsp_microcode; 363 const struct firmware *dsp_microcode;
364 const struct firmware *controller_microcode; 364 const struct firmware *controller_microcode;
365 365
366#ifdef CONFIG_PM 366#ifdef CONFIG_PM_SLEEP
367 u32 *saved_regs; 367 u32 *saved_regs;
368 u32 saved_ydsxgr_mode; 368 u32 saved_ydsxgr_mode;
369 u16 saved_dsxg_legacy; 369 u16 saved_dsxg_legacy;
diff --git a/sound/pci/ymfpci/ymfpci_main.c b/sound/pci/ymfpci/ymfpci_main.c
index 62b23635b754..ee8b6366e48d 100644
--- a/sound/pci/ymfpci/ymfpci_main.c
+++ b/sound/pci/ymfpci/ymfpci_main.c
@@ -2242,7 +2242,7 @@ static int snd_ymfpci_free(struct snd_ymfpci *chip)
2242 pci_set_power_state(chip->pci, 3); 2242 pci_set_power_state(chip->pci, 3);
2243#endif 2243#endif
2244 2244
2245#ifdef CONFIG_PM 2245#ifdef CONFIG_PM_SLEEP
2246 vfree(chip->saved_regs); 2246 vfree(chip->saved_regs);
2247#endif 2247#endif
2248 if (chip->irq >= 0) 2248 if (chip->irq >= 0)
@@ -2272,7 +2272,7 @@ static int snd_ymfpci_dev_free(struct snd_device *device)
2272 return snd_ymfpci_free(chip); 2272 return snd_ymfpci_free(chip);
2273} 2273}
2274 2274
2275#ifdef CONFIG_PM 2275#ifdef CONFIG_PM_SLEEP
2276static int saved_regs_index[] = { 2276static int saved_regs_index[] = {
2277 /* spdif */ 2277 /* spdif */
2278 YDSXGR_SPDIFOUTCTRL, 2278 YDSXGR_SPDIFOUTCTRL,
@@ -2374,7 +2374,7 @@ static int snd_ymfpci_resume(struct device *dev)
2374} 2374}
2375 2375
2376SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume); 2376SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume);
2377#endif /* CONFIG_PM */ 2377#endif /* CONFIG_PM_SLEEP */
2378 2378
2379int __devinit snd_ymfpci_create(struct snd_card *card, 2379int __devinit snd_ymfpci_create(struct snd_card *card,
2380 struct pci_dev * pci, 2380 struct pci_dev * pci,
@@ -2452,7 +2452,7 @@ int __devinit snd_ymfpci_create(struct snd_card *card,
2452 return err; 2452 return err;
2453 } 2453 }
2454 2454
2455#ifdef CONFIG_PM 2455#ifdef CONFIG_PM_SLEEP
2456 chip->saved_regs = vmalloc(YDSXGR_NUM_SAVED_REGS * sizeof(u32)); 2456 chip->saved_regs = vmalloc(YDSXGR_NUM_SAVED_REGS * sizeof(u32));
2457 if (chip->saved_regs == NULL) { 2457 if (chip->saved_regs == NULL) {
2458 snd_ymfpci_free(chip); 2458 snd_ymfpci_free(chip);