ALSA: pci: Drop superfluous ifdef CONFIG_PROC_FS (3270f0dd) · Commits · 戴 / test

sound/pci/ak4531_codec.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -35,11 +35,7 @@ MODULE_DESCRIPTION("Universal routines for AK4531 codec");
		MODULE_LICENSE("GPL");
		*/

		#ifdef CONFIG_PROC_FS
		static void snd_ak4531_proc_init(struct snd_card card, struct snd_ak4531 ak4531);
		#else
		#define snd_ak4531_proc_init(card,ak)
		#endif

		/*
		*
		@@ -466,7 +462,6 @@ void snd_ak4531_resume(struct snd_ak4531 *ak4531)
		}
		#endif

		#ifdef CONFIG_PROC_FS
		/*
		* /proc interface
		*/
		@@ -491,4 +486,3 @@ snd_ak4531_proc_init(struct snd_card card, struct snd_ak4531 ak4531)
		if (! snd_card_proc_new(card, "ak4531", &entry))
		snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);
		}
		#endif

+0 −4

Original line number	Diff line number	Diff line
		@@ -1530,7 +1530,6 @@ static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
		#endif /* CONFIG_PM_SLEEP */


		#ifdef CONFIG_PROC_FS
		/*
		* proc interface for register dump
		*/
		@@ -1552,9 +1551,6 @@ static void snd_atiixp_proc_init(struct atiixp *chip)
		if (! snd_card_proc_new(chip->card, "atiixp", &entry))
		snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);
		}
		#else /* !CONFIG_PROC_FS */
		#define snd_atiixp_proc_init(chip)
		#endif


		/*

+0 −4

Original line number	Diff line number	Diff line
		@@ -1156,7 +1156,6 @@ static SIMPLE_DEV_PM_OPS(snd_atiixp_pm, snd_atiixp_suspend, snd_atiixp_resume);
		#define SND_ATIIXP_PM_OPS NULL
		#endif /* CONFIG_PM_SLEEP */

		#ifdef CONFIG_PROC_FS
		/*
		* proc interface for register dump
		*/
		@@ -1178,9 +1177,6 @@ static void snd_atiixp_proc_init(struct atiixp_modem *chip)
		if (! snd_card_proc_new(chip->card, "atiixp-modem", &entry))
		snd_info_set_text_ops(entry, chip, snd_atiixp_proc_read);
		}
		#else
		#define snd_atiixp_proc_init(chip)
		#endif


		/*

+0 −5

Original line number	Diff line number	Diff line
		@@ -2772,7 +2772,6 @@ static int snd_cmipci_mixer_new(struct cmipci *cm, int pcm_spdif_device)
		* proc interface
		*/

		#ifdef CONFIG_PROC_FS
		static void snd_cmipci_proc_read(struct snd_info_entry *entry,
		struct snd_info_buffer *buffer)
		{
		@@ -2798,10 +2797,6 @@ static void snd_cmipci_proc_init(struct cmipci *cm)
		if (! snd_card_proc_new(cm->card, "cmipci", &entry))
		snd_info_set_text_ops(entry, cm, snd_cmipci_proc_read);
		}
		#else /* !CONFIG_PROC_FS */
		static inline void snd_cmipci_proc_init(struct cmipci *cm) {}
		#endif


		static const struct pci_device_id snd_cmipci_ids[] = {
		{PCI_VDEVICE(CMEDIA, PCI_DEVICE_ID_CMEDIA_CM8338A), 0},

+1 −6

Original line number	Diff line number	Diff line
		@@ -203,7 +203,6 @@ static const char * const ext_clock_names[3] = {"IEC958 In", "Word Clock 1xFS",
		#define AK4620_DEEMVOL_REG 0x03
		#define AK4620_SMUTE (1<<7)

		#ifdef CONFIG_PROC_FS
		/*
		* Conversion from int value to its binary form. Used for debugging.
		* The output buffer must be allocated prior to calling the function.
		@@ -228,7 +227,6 @@ static char get_binary(char buffer, int value)
		buffer[pos] = '\0';
		return buffer;
		}
		#endif /* CONFIG_PROC_FS */

		/*
		* Initial setup of the conversion array GPIO <-> rate
		@@ -486,7 +484,7 @@ static void set_cpld(struct snd_ice1712 *ice, unsigned int val)
		reg_write(ice, GPIO_CPLD_CSN, val);
		spec->cpld = val;
		}
		#ifdef CONFIG_PROC_FS

		static void proc_regs_read(struct snd_info_entry *entry,
		struct snd_info_buffer *buffer)
		{
		@@ -507,9 +505,6 @@ static void proc_init(struct snd_ice1712 *ice)
		if (!snd_card_proc_new(ice->card, "quartet", &entry))
		snd_info_set_text_ops(entry, ice, proc_regs_read);
		}
		#else /* !CONFIG_PROC_FS */
		static void proc_init(struct snd_ice1712 *ice) {}
		#endif

		static int qtet_mute_get(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)