diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-12-01 04:42:42 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:02 -0500 |
commit | e28563cceb9f258ebe3c50fc27d8f4ff0ac4bfa4 (patch) | |
tree | b69095abb998dedc2953368ba2c75978d80f644a /include/sound | |
parent | 7cd01dd840824e7c6023ad1dbfdb94a2183a7adb (diff) |
[ALSA] Optimize for config without PROC_FS
Modules: HWDEP Midlevel,ALSA Core,PCM Midlevel,Timer Midlevel
Optimize the code when compiled without CONFIG_PROC_FS.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/info.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/include/sound/info.h b/include/sound/info.h index df03e6017547..8ea5c7497c03 100644 --- a/include/sound/info.h +++ b/include/sound/info.h | |||
@@ -87,8 +87,6 @@ struct snd_info_entry { | |||
87 | struct semaphore access; | 87 | struct semaphore access; |
88 | }; | 88 | }; |
89 | 89 | ||
90 | int snd_info_check_reserved_words(const char *str); | ||
91 | |||
92 | #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) | 90 | #if defined(CONFIG_SND_OSSEMUL) && defined(CONFIG_PROC_FS) |
93 | int snd_info_minor_register(void); | 91 | int snd_info_minor_register(void); |
94 | int snd_info_minor_unregister(void); | 92 | int snd_info_minor_unregister(void); |
@@ -142,6 +140,7 @@ static inline void snd_info_set_text_ops(struct snd_info_entry *entry, | |||
142 | entry->c.text.read = read; | 140 | entry->c.text.read = read; |
143 | } | 141 | } |
144 | 142 | ||
143 | int snd_info_check_reserved_words(const char *str); | ||
145 | 144 | ||
146 | #else | 145 | #else |
147 | 146 | ||
@@ -164,8 +163,14 @@ static inline int snd_info_card_free(struct snd_card * card) { return 0; } | |||
164 | static inline int snd_info_register(struct snd_info_entry * entry) { return 0; } | 163 | static inline int snd_info_register(struct snd_info_entry * entry) { return 0; } |
165 | static inline int snd_info_unregister(struct snd_info_entry * entry) { return 0; } | 164 | static inline int snd_info_unregister(struct snd_info_entry * entry) { return 0; } |
166 | 165 | ||
167 | #define snd_card_proc_new(card,name,entryp) 0 /* always success */ | 166 | static inline int snd_card_proc_new(struct snd_card *card, const char *name, |
168 | #define snd_info_set_text_ops(entry,private_data,read_size,read) /*NOP*/ | 167 | struct snd_info_entry **entryp) { return -EINVAL; } |
168 | static inline void snd_info_set_text_ops(struct snd_info_entry *entry __attribute__((unused)), | ||
169 | void *private_data, | ||
170 | long read_size, | ||
171 | void (*read)(struct snd_info_entry *, struct snd_info_buffer *)) {} | ||
172 | |||
173 | static inline int snd_info_check_reserved_words(const char *str) { return 1; } | ||
169 | 174 | ||
170 | #endif | 175 | #endif |
171 | 176 | ||