diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-12-01 04:43:51 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:30:05 -0500 |
commit | 04f141a8800d022981f0405a8d307c98aba55105 (patch) | |
tree | 2083ebe4a2959d57db1c016f1b8fa396e5c3f2af /sound/core/oss | |
parent | e28563cceb9f258ebe3c50fc27d8f4ff0ac4bfa4 (diff) |
[ALSA] Optimize for config without PROC_FS (seq and oss parts)
Modules: ALSA<-OSS emulation,ALSA sequencer,ALSA<-OSS sequencer
Optimize the code when compiled without CONFIG_PROC_FS (in seq and oss
emulation parts).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/core/oss')
-rw-r--r-- | sound/core/oss/mixer_oss.c | 5 | ||||
-rw-r--r-- | sound/core/oss/pcm_oss.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/sound/core/oss/mixer_oss.c b/sound/core/oss/mixer_oss.c index 2d7a42014f5..f08e65a2bff 100644 --- a/sound/core/oss/mixer_oss.c +++ b/sound/core/oss/mixer_oss.c | |||
@@ -1053,6 +1053,7 @@ static int snd_mixer_oss_build_input(struct snd_mixer_oss *mixer, struct snd_mix | |||
1053 | return 0; | 1053 | return 0; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | #ifdef CONFIG_PROC_FS | ||
1056 | /* | 1057 | /* |
1057 | */ | 1058 | */ |
1058 | #define MIXER_VOL(name) [SOUND_MIXER_##name] = #name | 1059 | #define MIXER_VOL(name) [SOUND_MIXER_##name] = #name |
@@ -1200,6 +1201,10 @@ static void snd_mixer_oss_proc_done(struct snd_mixer_oss *mixer) | |||
1200 | mixer->proc_entry = NULL; | 1201 | mixer->proc_entry = NULL; |
1201 | } | 1202 | } |
1202 | } | 1203 | } |
1204 | #else /* !CONFIG_PROC_FS */ | ||
1205 | #define snd_mixer_oss_proc_init(mix) | ||
1206 | #define snd_mixer_oss_proc_done(mix) | ||
1207 | #endif /* CONFIG_PROC_FS */ | ||
1203 | 1208 | ||
1204 | static void snd_mixer_oss_build(struct snd_mixer_oss *mixer) | 1209 | static void snd_mixer_oss_build(struct snd_mixer_oss *mixer) |
1205 | { | 1210 | { |
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 2ae283c7b28..16df1246a13 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c | |||
@@ -2269,6 +2269,7 @@ static int snd_pcm_oss_mmap(struct file *file, struct vm_area_struct *area) | |||
2269 | return 0; | 2269 | return 0; |
2270 | } | 2270 | } |
2271 | 2271 | ||
2272 | #ifdef CONFIG_PROC_FS | ||
2272 | /* | 2273 | /* |
2273 | * /proc interface | 2274 | * /proc interface |
2274 | */ | 2275 | */ |
@@ -2420,6 +2421,10 @@ static void snd_pcm_oss_proc_done(struct snd_pcm *pcm) | |||
2420 | } | 2421 | } |
2421 | } | 2422 | } |
2422 | } | 2423 | } |
2424 | #else /* !CONFIG_PROC_FS */ | ||
2425 | #define snd_pcm_oss_proc_init(pcm) | ||
2426 | #define snd_pcm_oss_proc_done(pcm) | ||
2427 | #endif /* CONFIG_PROC_FS */ | ||
2423 | 2428 | ||
2424 | /* | 2429 | /* |
2425 | * ENTRY functions | 2430 | * ENTRY functions |