summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2015-05-29 01:55:37 -0400
committerTakashi Iwai <tiwai@suse.de>2015-05-29 01:55:37 -0400
commit95bb6258d6bd5d6608949e2fdafbd191705175d3 (patch)
treef573fd4802823dc7c9311690dba611cf664fa6e1 /sound/pci
parent1c1784387a8aed1a3ea4686e24205f0383af17ba (diff)
ALSA: cs46xx: Fix old ifdef CONFIG_PROC_FS
Replaced with the new CONFIG_SND_PROC_FS. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.c4
-rw-r--r--sound/pci/cs46xx/cs46xx_lib.h4
-rw-r--r--sound/pci/cs46xx/dsp_spos.c4
-rw-r--r--sound/pci/cs46xx/dsp_spos_scb_lib.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 8d74004b1ed2..2a9f4a345171 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2816,7 +2816,7 @@ int snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }
2816static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { } 2816static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }
2817#endif /* CONFIG_GAMEPORT */ 2817#endif /* CONFIG_GAMEPORT */
2818 2818
2819#ifdef CONFIG_PROC_FS 2819#ifdef CONFIG_SND_PROC_FS
2820/* 2820/*
2821 * proc interface 2821 * proc interface
2822 */ 2822 */
@@ -2865,7 +2865,7 @@ static int snd_cs46xx_proc_done(struct snd_cs46xx *chip)
2865#endif 2865#endif
2866 return 0; 2866 return 0;
2867} 2867}
2868#else /* !CONFIG_PROC_FS */ 2868#else /* !CONFIG_SND_PROC_FS */
2869#define snd_cs46xx_proc_init(card, chip) 2869#define snd_cs46xx_proc_init(card, chip)
2870#define snd_cs46xx_proc_done(chip) 2870#define snd_cs46xx_proc_done(chip)
2871#endif 2871#endif
diff --git a/sound/pci/cs46xx/cs46xx_lib.h b/sound/pci/cs46xx/cs46xx_lib.h
index 86f14620f817..bdf4114167ea 100644
--- a/sound/pci/cs46xx/cs46xx_lib.h
+++ b/sound/pci/cs46xx/cs46xx_lib.h
@@ -95,7 +95,7 @@ int cs46xx_dsp_resume(struct snd_cs46xx * chip);
95#endif 95#endif
96struct dsp_symbol_entry *cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name, 96struct dsp_symbol_entry *cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name,
97 int symbol_type); 97 int symbol_type);
98#ifdef CONFIG_PROC_FS 98#ifdef CONFIG_SND_PROC_FS
99int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip); 99int cs46xx_dsp_proc_init (struct snd_card *card, struct snd_cs46xx *chip);
100int cs46xx_dsp_proc_done (struct snd_cs46xx *chip); 100int cs46xx_dsp_proc_done (struct snd_cs46xx *chip);
101#else 101#else
@@ -118,7 +118,7 @@ int cs46xx_dsp_disable_adc_capture (struct snd_cs46xx *chip);
118int cs46xx_poke_via_dsp (struct snd_cs46xx *chip, u32 address, u32 data); 118int cs46xx_poke_via_dsp (struct snd_cs46xx *chip, u32 address, u32 data);
119struct dsp_scb_descriptor * cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name, 119struct dsp_scb_descriptor * cs46xx_dsp_create_scb (struct snd_cs46xx *chip, char * name,
120 u32 * scb_data, u32 dest); 120 u32 * scb_data, u32 dest);
121#ifdef CONFIG_PROC_FS 121#ifdef CONFIG_SND_PROC_FS
122void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb); 122void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb);
123void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip, 123void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
124 struct dsp_scb_descriptor * scb); 124 struct dsp_scb_descriptor * scb);
diff --git a/sound/pci/cs46xx/dsp_spos.c b/sound/pci/cs46xx/dsp_spos.c
index 5c99efb004c0..d2951ed4bf71 100644
--- a/sound/pci/cs46xx/dsp_spos.c
+++ b/sound/pci/cs46xx/dsp_spos.c
@@ -476,7 +476,7 @@ cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name, int symb
476} 476}
477 477
478 478
479#ifdef CONFIG_PROC_FS 479#ifdef CONFIG_SND_PROC_FS
480static struct dsp_symbol_entry * 480static struct dsp_symbol_entry *
481cs46xx_dsp_lookup_symbol_addr (struct snd_cs46xx * chip, u32 address, int symbol_type) 481cs46xx_dsp_lookup_symbol_addr (struct snd_cs46xx * chip, u32 address, int symbol_type)
482{ 482{
@@ -929,7 +929,7 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)
929 929
930 return 0; 930 return 0;
931} 931}
932#endif /* CONFIG_PROC_FS */ 932#endif /* CONFIG_SND_PROC_FS */
933 933
934static void _dsp_create_task_tree (struct snd_cs46xx *chip, u32 * task_data, 934static void _dsp_create_task_tree (struct snd_cs46xx *chip, u32 * task_data,
935 u32 dest, int size) 935 u32 dest, int size)
diff --git a/sound/pci/cs46xx/dsp_spos_scb_lib.c b/sound/pci/cs46xx/dsp_spos_scb_lib.c
index 2c90c0bded69..7488e1b7a770 100644
--- a/sound/pci/cs46xx/dsp_spos_scb_lib.c
+++ b/sound/pci/cs46xx/dsp_spos_scb_lib.c
@@ -67,7 +67,7 @@ static void remove_symbol (struct snd_cs46xx * chip, struct dsp_symbol_entry * s
67 67
68} 68}
69 69
70#ifdef CONFIG_PROC_FS 70#ifdef CONFIG_SND_PROC_FS
71static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry, 71static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
72 struct snd_info_buffer *buffer) 72 struct snd_info_buffer *buffer)
73{ 73{
@@ -228,7 +228,7 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx *chip, struct dsp_scb_descriptor *
228} 228}
229 229
230 230
231#ifdef CONFIG_PROC_FS 231#ifdef CONFIG_SND_PROC_FS
232void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb) 232void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb)
233{ 233{
234 if (scb->proc_info) { 234 if (scb->proc_info) {
@@ -285,7 +285,7 @@ out:
285 scb->proc_info = entry; 285 scb->proc_info = entry;
286 } 286 }
287} 287}
288#endif /* CONFIG_PROC_FS */ 288#endif /* CONFIG_SND_PROC_FS */
289 289
290static struct dsp_scb_descriptor * 290static struct dsp_scb_descriptor *
291_dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32 dest, 291_dsp_create_generic_scb (struct snd_cs46xx *chip, char * name, u32 * scb_data, u32 dest,