redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[ALSA] Remove ifdefs from OSS PCM emulation codes 

Fix Makefile to compile files conditionally to CONFIG_SND_PCM_OSS_PLUGINS,
and remove unneeded ifdefs in these files.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
hifive-unleashed-5.1
Takashi Iwai 2007-08-08 15:20:48 +02:00 committed by Jaroslav Kysela
parent a110133d4c
commit 887f9f0253
8 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/core/oss/Makefile
View File

@ -5,8 +5,9 @@
snd-mixer-oss-objs := mixer_oss.o
snd-pcm-oss-objs := pcm_oss.o pcm_plugin.o \
io.o copy.o linear.o mulaw.o route.o rate.o
snd-pcm-oss-y := pcm_oss.o
snd-pcm-oss-$(CONFIG_SND_PCM_OSS_PLUGINS) += pcm_plugin.o \
io.o copy.o linear.o mulaw.o route.o rate.o
obj-$(CONFIG_SND_MIXER_OSS) += snd-mixer-oss.o
obj-$(CONFIG_SND_PCM_OSS) += snd-pcm-oss.o

5
sound/core/oss/copy.c
View File

@ -20,9 +20,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@ -88,5 +85,3 @@ int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif

5
sound/core/oss/io.c
View File

@ -20,9 +20,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@ -135,5 +132,3 @@ int snd_pcm_plugin_build_io(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif

5
sound/core/oss/linear.c
View File

@ -21,9 +21,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@ -159,5 +156,3 @@ int snd_pcm_plugin_build_linear(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif

5
sound/core/oss/mulaw.c
View File

@ -22,9 +22,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@ -328,5 +325,3 @@ int snd_pcm_plugin_build_mulaw(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif

5
sound/core/oss/pcm_plugin.c
View File

@ -25,9 +25,6 @@
#endif
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/slab.h>
#include <linux/time.h>
#include <linux/vmalloc.h>
@ -740,5 +737,3 @@ int snd_pcm_area_copy(const struct snd_pcm_channel_area *src_area, size_t src_of
}
return 0;
}
#endif

5
sound/core/oss/rate.c
View File

@ -20,9 +20,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/time.h>
#include <sound/core.h>
#include <sound/pcm.h>
@ -340,5 +337,3 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif

5
sound/core/oss/route.c
View File

@ -20,9 +20,6 @@
*/
#include <sound/driver.h>
#ifdef CONFIG_SND_PCM_OSS_PLUGINS
#include <linux/slab.h>
#include <linux/time.h>
#include <sound/core.h>
@ -108,5 +105,3 @@ int snd_pcm_plugin_build_route(struct snd_pcm_substream *plug,
*r_plugin = plugin;
return 0;
}
#endif