aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ca0106
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/ca0106
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/ca0106')
-rw-r--r--sound/pci/ca0106/ca0106.h4
-rw-r--r--sound/pci/ca0106/ca0106_main.c2
-rw-r--r--sound/pci/ca0106/ca0106_mixer.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/ca0106/ca0106.h b/sound/pci/ca0106/ca0106.h
index e8e8ccc96403..04402c14cb23 100644
--- a/sound/pci/ca0106/ca0106.h
+++ b/sound/pci/ca0106/ca0106.h
@@ -710,7 +710,7 @@ struct snd_ca0106 {
710 710
711 u16 spi_dac_reg[16]; 711 u16 spi_dac_reg[16];
712 712
713#ifdef CONFIG_PM 713#ifdef CONFIG_PM_SLEEP
714#define NUM_SAVED_VOLUMES 9 714#define NUM_SAVED_VOLUMES 9
715 unsigned int saved_vol[NUM_SAVED_VOLUMES]; 715 unsigned int saved_vol[NUM_SAVED_VOLUMES];
716#endif 716#endif
@@ -733,7 +733,7 @@ int snd_ca0106_i2c_write(struct snd_ca0106 *emu, u32 reg, u32 value);
733int snd_ca0106_spi_write(struct snd_ca0106 * emu, 733int snd_ca0106_spi_write(struct snd_ca0106 * emu,
734 unsigned int data); 734 unsigned int data);
735 735
736#ifdef CONFIG_PM 736#ifdef CONFIG_PM_SLEEP
737void snd_ca0106_mixer_suspend(struct snd_ca0106 *chip); 737void snd_ca0106_mixer_suspend(struct snd_ca0106 *chip);
738void snd_ca0106_mixer_resume(struct snd_ca0106 *chip); 738void snd_ca0106_mixer_resume(struct snd_ca0106 *chip);
739#else 739#else
diff --git a/sound/pci/ca0106/ca0106_main.c b/sound/pci/ca0106/ca0106_main.c
index 83277b747b36..fc6787699ba9 100644
--- a/sound/pci/ca0106/ca0106_main.c
+++ b/sound/pci/ca0106/ca0106_main.c
@@ -1871,7 +1871,7 @@ static void __devexit snd_ca0106_remove(struct pci_dev *pci)
1871 pci_set_drvdata(pci, NULL); 1871 pci_set_drvdata(pci, NULL);
1872} 1872}
1873 1873
1874#ifdef CONFIG_PM 1874#ifdef CONFIG_PM_SLEEP
1875static int snd_ca0106_suspend(struct device *dev) 1875static int snd_ca0106_suspend(struct device *dev)
1876{ 1876{
1877 struct pci_dev *pci = to_pci_dev(dev); 1877 struct pci_dev *pci = to_pci_dev(dev);
diff --git a/sound/pci/ca0106/ca0106_mixer.c b/sound/pci/ca0106/ca0106_mixer.c
index 84f3f92436b5..68eacf7002d6 100644
--- a/sound/pci/ca0106/ca0106_mixer.c
+++ b/sound/pci/ca0106/ca0106_mixer.c
@@ -907,7 +907,7 @@ int __devinit snd_ca0106_mixer(struct snd_ca0106 *emu)
907 return 0; 907 return 0;
908} 908}
909 909
910#ifdef CONFIG_PM 910#ifdef CONFIG_PM_SLEEP
911struct ca0106_vol_tbl { 911struct ca0106_vol_tbl {
912 unsigned int channel_id; 912 unsigned int channel_id;
913 unsigned int reg; 913 unsigned int reg;
@@ -953,4 +953,4 @@ void snd_ca0106_mixer_resume(struct snd_ca0106 *chip)
953 if (chip->details->i2c_adc) 953 if (chip->details->i2c_adc)
954 ca0106_set_capture_mic_line_in(chip); 954 ca0106_set_capture_mic_line_in(chip);
955} 955}
956#endif /* CONFIG_PM */ 956#endif /* CONFIG_PM_SLEEP */