ALSA: Kill snd_assert() in sound/core/*

[linux-2.6-omap-h63xx.git] / sound / core / oss / route.c

diff --git a/sound/core/oss/route.c b/sound/core/oss/route.c
index da7ab7a3e82cdd51d51a11cc3e2bf935bbc464c9..0dcc2870d537752c98de1014df65330f051e9dfe 100644 (file)
--- a/sound/core/oss/route.c
+++ b/sound/core/oss/route.c
@@ -54,7 +54,8 @@ static snd_pcm_sframes_t route_transfer(struct snd_pcm_plugin *plugin,
        struct snd_pcm_plugin_channel *dvp;
        int format;
 
-       snd_assert(plugin != NULL && src_channels != NULL && dst_channels != NULL, return -ENXIO);
+       if (snd_BUG_ON(!plugin || !src_channels || !dst_channels))
+               return -ENXIO;
        if (frames == 0)
                return 0;
 
@@ -90,10 +91,13 @@ int snd_pcm_plugin_build_route(struct snd_pcm_substream *plug,
        struct snd_pcm_plugin *plugin;
        int err;
 
-       snd_assert(r_plugin != NULL, return -ENXIO);
+       if (snd_BUG_ON(!r_plugin))
+               return -ENXIO;
        *r_plugin = NULL;
-       snd_assert(src_format->rate == dst_format->rate, return -ENXIO);
-       snd_assert(src_format->format == dst_format->format, return -ENXIO);
+       if (snd_BUG_ON(src_format->rate != dst_format->rate))
+               return -ENXIO;
+       if (snd_BUG_ON(src_format->format != dst_format->format))
+               return -ENXIO;
 
        err = snd_pcm_plugin_build(plug, "route conversion",
                                   src_format, dst_format, 0, &plugin);