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

Kill snd_assert() in sound/core/*, either removed or replaced with
if () with snd_BUG_ON().

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

1 files changed, 18 insertions, 12 deletions

diff --git a/sound/core/oss/copy.c b/sound/core/oss/copy.c
index 9ded30d0e97d..05b58d4fc2b7 100644
--- a/sound/core/oss/copy.c
+++ b/sound/core/oss/copy.c
@@ -32,17 +32,18 @@ static snd_pcm_sframes_t copy_transfer(struct snd_pcm_plugin *plugin,
         unsigned int channel;
         unsigned int nchannels;
 
-        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;
         nchannels = plugin->src_format.channels;
         for (channel = 0; channel < nchannels; channel++) {
-                snd_assert(src_channels->area.first % 8 == 0 &&
-                           src_channels->area.step % 8 == 0,
-                           return -ENXIO);
-                snd_assert(dst_channels->area.first % 8 == 0 &&
-                           dst_channels->area.step % 8 == 0,
-                           return -ENXIO);
+                if (snd_BUG_ON(src_channels->area.first % 8 ||
+                               src_channels->area.step % 8))
+                        return -ENXIO;
+                if (snd_BUG_ON(dst_channels->area.first % 8 ||
+                               dst_channels->area.step % 8))
+                        return -ENXIO;
                 if (!src_channels->enabled) {
                         if (dst_channels->wanted)
                                 snd_pcm_area_silence(&dst_channels->area, 0, frames, plugin->dst_format.format);
@@ -66,15 +67,20 @@ int snd_pcm_plugin_build_copy(struct snd_pcm_substream *plug,
         struct snd_pcm_plugin *plugin;
         int width;
 
-        snd_assert(r_plugin != NULL, return -ENXIO);
+        if (snd_BUG_ON(!r_plugin))
+                return -ENXIO;
         *r_plugin = NULL;
 
-        snd_assert(src_format->format == dst_format->format, return -ENXIO);
-        snd_assert(src_format->rate == dst_format->rate, return -ENXIO);
-        snd_assert(src_format->channels == dst_format->channels, return -ENXIO);
+        if (snd_BUG_ON(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->channels != dst_format->channels))
+                return -ENXIO;
 
         width = snd_pcm_format_physical_width(src_format->format);
-        snd_assert(width > 0, return -ENXIO);
+        if (snd_BUG_ON(width <= 0))
+                return -ENXIO;
 
         err = snd_pcm_plugin_build(plug, "copy", src_format, dst_format,
                                    0, &plugin);