ALSA: cs46xx: Fix old ifdef CONFIG_PROC_FS (95bb6258) · Commits · 戴 / test

sound/pci/cs46xx/cs46xx_lib.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2816,7 +2816,7 @@ int snd_cs46xx_gameport(struct snd_cs46xx *chip) { return -ENOSYS; }
		static inline void snd_cs46xx_remove_gameport(struct snd_cs46xx *chip) { }
		#endif /* CONFIG_GAMEPORT */

		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		/*
		* proc interface
		*/
		@@ -2865,7 +2865,7 @@ static int snd_cs46xx_proc_done(struct snd_cs46xx *chip)
		#endif
		return 0;
		}
		#else /* !CONFIG_PROC_FS */
		#else /* !CONFIG_SND_PROC_FS */
		#define snd_cs46xx_proc_init(card, chip)
		#define snd_cs46xx_proc_done(chip)
		#endif

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,7 +95,7 @@ int cs46xx_dsp_resume(struct snd_cs46xx * chip);
		#endif
		struct dsp_symbol_entry cs46xx_dsp_lookup_symbol (struct snd_cs46xx chip, char * symbol_name,
		int symbol_type);
		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		int cs46xx_dsp_proc_init (struct snd_card card, struct snd_cs46xx chip);
		int cs46xx_dsp_proc_done (struct snd_cs46xx *chip);
		#else
		@@ -118,7 +118,7 @@ int cs46xx_dsp_disable_adc_capture (struct snd_cs46xx *chip);
		int cs46xx_poke_via_dsp (struct snd_cs46xx *chip, u32 address, u32 data);
		struct dsp_scb_descriptor * cs46xx_dsp_create_scb (struct snd_cs46xx chip, char name,
		u32 * scb_data, u32 dest);
		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb);
		void cs46xx_dsp_proc_register_scb_desc (struct snd_cs46xx *chip,
		struct dsp_scb_descriptor * scb);

+2 −2

Original line number	Diff line number	Diff line
		@@ -476,7 +476,7 @@ cs46xx_dsp_lookup_symbol (struct snd_cs46xx * chip, char * symbol_name, int symb
		}


		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		static struct dsp_symbol_entry *
		cs46xx_dsp_lookup_symbol_addr (struct snd_cs46xx * chip, u32 address, int symbol_type)
		{
		@@ -929,7 +929,7 @@ int cs46xx_dsp_proc_done (struct snd_cs46xx *chip)

		return 0;
		}
		#endif /* CONFIG_PROC_FS */
		#endif /* CONFIG_SND_PROC_FS */

		static void _dsp_create_task_tree (struct snd_cs46xx chip, u32 task_data,
		u32 dest, int size)

+3 −3

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ static void remove_symbol (struct snd_cs46xx * chip, struct dsp_symbol_entry * s

		}

		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		static void cs46xx_dsp_proc_scb_info_read (struct snd_info_entry *entry,
		struct snd_info_buffer *buffer)
		{
		@@ -228,7 +228,7 @@ void cs46xx_dsp_remove_scb (struct snd_cs46xx chip, struct dsp_scb_descriptor
		}


		#ifdef CONFIG_PROC_FS
		#ifdef CONFIG_SND_PROC_FS
		void cs46xx_dsp_proc_free_scb_desc (struct dsp_scb_descriptor * scb)
		{
		if (scb->proc_info) {
		@@ -285,7 +285,7 @@ out:
		scb->proc_info = entry;
		}
		}
		#endif /* CONFIG_PROC_FS */
		#endif /* CONFIG_SND_PROC_FS */

		static struct dsp_scb_descriptor *
		_dsp_create_generic_scb (struct snd_cs46xx chip, char name, u32 * scb_data, u32 dest,