Merge branch 'linus'

1 files changed, 6 insertions, 22 deletions

diff --git a/sound/core/oss/pcm_plugin.h b/sound/core/oss/pcm_plugin.h
index 29198da615cd..3be91b3d5377 100644
--- a/sound/core/oss/pcm_plugin.h
+++ b/sound/core/oss/pcm_plugin.h
@@ -22,12 +22,7 @@
  *
  */
 
-#include <linux/bitmap.h>
-
-static inline unsigned long *bitmap_alloc(unsigned int nbits)
-{
-        return kmalloc(BITS_TO_LONGS(nbits), GFP_KERNEL);
-}
+#ifdef CONFIG_SND_PCM_OSS_PLUGINS
 
 #define snd_pcm_plug_stream(plug) ((plug)->stream)
 
@@ -69,12 +64,6 @@ struct snd_pcm_plugin {
         snd_pcm_sframes_t (*client_channels)(struct snd_pcm_plugin *plugin,
                                              snd_pcm_uframes_t frames,
                                              struct snd_pcm_plugin_channel **channels);
-        int (*src_channels_mask)(struct snd_pcm_plugin *plugin,
-                                 unsigned long *dst_vmask,
-                                 unsigned long **src_vmask);
-        int (*dst_channels_mask)(struct snd_pcm_plugin *plugin,
-                                 unsigned long *src_vmask,
-                                 unsigned long **dst_vmask);
         snd_pcm_sframes_t (*transfer)(struct snd_pcm_plugin *plugin,
                                       const struct snd_pcm_plugin_channel *src_channels,
                                       struct snd_pcm_plugin_channel *dst_channels,
@@ -90,8 +79,6 @@ struct snd_pcm_plugin {
         char *buf;
         snd_pcm_uframes_t buf_frames;
         struct snd_pcm_plugin_channel *buf_channels;
-        unsigned long *src_vmask;
-        unsigned long *dst_vmask;
         char extra_data[0];
 };
 
@@ -128,7 +115,6 @@ int snd_pcm_plugin_build_rate(struct snd_pcm_substream *handle,
 int snd_pcm_plugin_build_route(struct snd_pcm_substream *handle,
                                struct snd_pcm_plugin_format *src_format,
                                struct snd_pcm_plugin_format *dst_format,
-                               int *ttable,
                                struct snd_pcm_plugin **r_plugin);
 int snd_pcm_plugin_build_copy(struct snd_pcm_substream *handle,
                               struct snd_pcm_plugin_format *src_format,
@@ -181,15 +167,13 @@ snd_pcm_sframes_t snd_pcm_oss_readv3(struct snd_pcm_substream *substream,
                                      void **bufs, snd_pcm_uframes_t frames,
                                      int in_kernel);
 
-#define ROUTE_PLUGIN_RESOLUTION 16
+#else
 
-int getput_index(int format);
-int copy_index(int format);
-int conv_index(int src_format, int dst_format);
+static inline snd_pcm_sframes_t snd_pcm_plug_client_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t drv_size) { return drv_size; }
+static inline snd_pcm_sframes_t snd_pcm_plug_slave_size(struct snd_pcm_substream *handle, snd_pcm_uframes_t clt_size) { return clt_size; }
+static inline int snd_pcm_plug_slave_format(int format, struct snd_mask *format_mask) { return format; }
 
-void zero_channel(struct snd_pcm_plugin *plugin,
-                  const struct snd_pcm_plugin_channel *dst_channel,
-                  size_t samples);
+#endif
 
 #ifdef PLUGIN_DEBUG
 #define pdprintf( fmt, args... ) printk( "plugin: " fmt, ##args)