diff options
author | Jie Yang <yang.jie@intel.com> | 2015-05-27 07:45:45 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-05-27 15:25:19 -0400 |
commit | cd6a65036f0eac4ad83dc371bb458e9e6ba6e306 (patch) | |
tree | 8fde8da6fa86c62608202b5772059426e16ad217 /sound/core/init.c | |
parent | e0ecb05a965d0ff77ec65499bbc74eacd8d93452 (diff) |
ALSA: replace CONFIG_PROC_FS with CONFIG_SND_PROC_FS
We may disable proc fs only for sound part, to reduce ALSA
memory footprint. So add CONFIG_SND_PROC_FS and replace the
old CONFIG_PROC_FSs in alsa code.
With sound proc fs disabled, we can save about 9KB memory
size on X86_64 platform.
Signed-off-by: Jie Yang <yang.jie@intel.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/init.c')
-rw-r--r-- | sound/core/init.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index f8abd2d8144e..3e0cebacefe1 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -100,7 +100,7 @@ int (*snd_mixer_oss_notify_callback)(struct snd_card *card, int free_flag); | |||
100 | EXPORT_SYMBOL(snd_mixer_oss_notify_callback); | 100 | EXPORT_SYMBOL(snd_mixer_oss_notify_callback); |
101 | #endif | 101 | #endif |
102 | 102 | ||
103 | #ifdef CONFIG_PROC_FS | 103 | #ifdef CONFIG_SND_PROC_FS |
104 | static void snd_card_id_read(struct snd_info_entry *entry, | 104 | static void snd_card_id_read(struct snd_info_entry *entry, |
105 | struct snd_info_buffer *buffer) | 105 | struct snd_info_buffer *buffer) |
106 | { | 106 | { |
@@ -122,7 +122,7 @@ static int init_info_for_card(struct snd_card *card) | |||
122 | 122 | ||
123 | return snd_info_card_register(card); | 123 | return snd_info_card_register(card); |
124 | } | 124 | } |
125 | #else /* !CONFIG_PROC_FS */ | 125 | #else /* !CONFIG_SND_PROC_FS */ |
126 | #define init_info_for_card(card) | 126 | #define init_info_for_card(card) |
127 | #endif | 127 | #endif |
128 | 128 | ||
@@ -776,7 +776,7 @@ int snd_card_register(struct snd_card *card) | |||
776 | 776 | ||
777 | EXPORT_SYMBOL(snd_card_register); | 777 | EXPORT_SYMBOL(snd_card_register); |
778 | 778 | ||
779 | #ifdef CONFIG_PROC_FS | 779 | #ifdef CONFIG_SND_PROC_FS |
780 | static void snd_card_info_read(struct snd_info_entry *entry, | 780 | static void snd_card_info_read(struct snd_info_entry *entry, |
781 | struct snd_info_buffer *buffer) | 781 | struct snd_info_buffer *buffer) |
782 | { | 782 | { |
@@ -861,7 +861,7 @@ int __init snd_card_info_init(void) | |||
861 | 861 | ||
862 | return 0; | 862 | return 0; |
863 | } | 863 | } |
864 | #endif /* CONFIG_PROC_FS */ | 864 | #endif /* CONFIG_SND_PROC_FS */ |
865 | 865 | ||
866 | /** | 866 | /** |
867 | * snd_component_add - add a component string | 867 | * snd_component_add - add a component string |