aboutsummaryrefslogtreecommitdiffstats
path: root/sound/core/oss/route.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/core/oss/route.c')
-rw-r--r--sound/core/oss/route.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index bbe25d8c450a..c8171f5783c8 100644
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -25,7 +25,7 @@
25#include "pcm_plugin.h" 25#include "pcm_plugin.h"
26 26
27static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts, 27static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,
28 snd_pcm_uframes_t frames, int format) 28 snd_pcm_uframes_t frames, snd_pcm_format_t format)
29{ 29{
30 int dst = 0; 30 int dst = 0;
31 for (; dst < ndsts; ++dst) { 31 for (; dst < ndsts; ++dst) {
@@ -38,7 +38,7 @@ static void zero_areas(struct snd_pcm_plugin_channel *dvp, int ndsts,
38 38
39static inline void copy_area(const struct snd_pcm_plugin_channel *src_channel, 39static inline void copy_area(const struct snd_pcm_plugin_channel *src_channel,
40 struct snd_pcm_plugin_channel *dst_channel, 40 struct snd_pcm_plugin_channel *dst_channel,
41 snd_pcm_uframes_t frames, int format) 41 snd_pcm_uframes_t frames, snd_pcm_format_t format)
42{ 42{
43 dst_channel->enabled = 1; 43 dst_channel->enabled = 1;
44 snd_pcm_area_copy(&src_channel->area, 0, &dst_channel->area, 0, frames, format); 44 snd_pcm_area_copy(&src_channel->area, 0, &dst_channel->area, 0, frames, format);
@@ -51,7 +51,7 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin,
51{ 51{
52 int nsrcs, ndsts, dst; 52 int nsrcs, ndsts, dst;
53 struct snd_pcm_plugin_channel *dvp; 53 struct snd_pcm_plugin_channel *dvp;
54 int format; 54 snd_pcm_format_t format;
55 55
56 if (snd_BUG_ON(!plugin || !src_channels || !dst_channels)) 56 if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
57 return -ENXIO; 57 return -ENXIO;