ALSA: Kill snd_assert() in other places

Kill snd_assert() in other places, 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>

4 files changed, 20 insertions, 10 deletions

diff --git a/sound/drivers/opl3/opl3_lib.c b/sound/drivers/opl3/opl3_lib.c
index ebe4359047cb..780582340fef 100644
--- a/sound/drivers/opl3/opl3_lib.c
+++ b/sound/drivers/opl3/opl3_lib.c
@@ -139,7 +139,8 @@ static int snd_opl3_detect(struct snd_opl3 * opl3)
                  * If we had an OPL4 chip, opl3->hardware would have been set
                  * by the OPL4 driver; so we can assume OPL3 here.
                  */
-                snd_assert(opl3->r_port != 0, return -ENODEV);
+                if (snd_BUG_ON(!opl3->r_port))
+                        return -ENODEV;
                 opl3->hardware = OPL3_HW_OPL3;
         }
         return 0;
@@ -324,7 +325,8 @@ EXPORT_SYMBOL(snd_opl3_interrupt);
 
 static int snd_opl3_free(struct snd_opl3 *opl3)
 {
-        snd_assert(opl3 != NULL, return -ENXIO);
+        if (snd_BUG_ON(!opl3))
+                return -ENXIO;
         if (opl3->private_free)
                 opl3->private_free(opl3);
         snd_opl3_clear_patches(opl3);
diff --git a/sound/drivers/opl3/opl3_midi.c b/sound/drivers/opl3/opl3_midi.c
index cebcb8b78acb..16feafa2c51e 100644
--- a/sound/drivers/opl3/opl3_midi.c
+++ b/sound/drivers/opl3/opl3_midi.c
@@ -617,7 +617,8 @@ static void snd_opl3_kill_voice(struct snd_opl3 *opl3, int voice)
 
         struct snd_opl3_voice *vp, *vp2;
 
-        snd_assert(voice < MAX_OPL3_VOICES, return);
+        if (snd_BUG_ON(voice >= MAX_OPL3_VOICES))
+                return;
 
         vp = &opl3->voices[voice];
         if (voice < MAX_OPL2_VOICES) {
@@ -737,7 +738,8 @@ static void snd_opl3_update_pitch(struct snd_opl3 *opl3, int voice)
 
         struct snd_opl3_voice *vp;
 
-        snd_assert(voice < MAX_OPL3_VOICES, return);
+        if (snd_BUG_ON(voice >= MAX_OPL3_VOICES))
+                return;
 
         vp = &opl3->voices[voice];
         if (vp->chan == NULL)
diff --git a/sound/drivers/opl3/opl3_oss.c b/sound/drivers/opl3/opl3_oss.c
index 239347f26154..9a2271dc046a 100644
--- a/sound/drivers/opl3/opl3_oss.c
+++ b/sound/drivers/opl3/opl3_oss.c
@@ -162,7 +162,8 @@ static int snd_opl3_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
         struct snd_opl3 *opl3 = closure;
         int err;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
 
         if ((err = snd_opl3_synth_setup(opl3)) < 0)
                 return err;
@@ -184,7 +185,8 @@ static int snd_opl3_close_seq_oss(struct snd_seq_oss_arg *arg)
 {
         struct snd_opl3 *opl3;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         opl3 = arg->private_data;
 
         snd_opl3_synth_cleanup(opl3);
@@ -206,7 +208,8 @@ static int snd_opl3_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
         char name[32];
         int err, type;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         opl3 = arg->private_data;
 
         if (format == FM_PATCH)
@@ -246,7 +249,8 @@ static int snd_opl3_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd,
 {
         struct snd_opl3 *opl3;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         opl3 = arg->private_data;
         switch (cmd) {
                 case SNDCTL_FM_LOAD_INSTR:
@@ -271,7 +275,8 @@ static int snd_opl3_reset_seq_oss(struct snd_seq_oss_arg *arg)
 {
         struct snd_opl3 *opl3;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         opl3 = arg->private_data;
 
         return 0;
diff --git a/sound/drivers/opl3/opl3_synth.c b/sound/drivers/opl3/opl3_synth.c
index fb64c890109b..962bb9c8b9c8 100644
--- a/sound/drivers/opl3/opl3_synth.c
+++ b/sound/drivers/opl3/opl3_synth.c
@@ -92,7 +92,8 @@ int snd_opl3_ioctl(struct snd_hwdep * hw, struct file *file,
         struct snd_opl3 *opl3 = hw->private_data;
         void __user *argp = (void __user *)arg;
 
-        snd_assert(opl3 != NULL, return -EINVAL);
+        if (snd_BUG_ON(!opl3))
+                return -EINVAL;
 
         switch (cmd) {
                 /* get information */