6 files changed, 78 insertions, 52 deletions

diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c
index c89d2ea594b9..f16a3fce4597 100644
--- a/sound/synth/emux/emux.c
+++ b/sound/synth/emux/emux.c
@@ -93,10 +93,10 @@ int snd_emux_register(struct snd_emux *emu, struct snd_card *card, int index, ch
         int err;
         struct snd_sf_callback sf_cb;
 
-        snd_assert(emu->hw != NULL, return -EINVAL);
-        snd_assert(emu->max_voices > 0, return -EINVAL);
-        snd_assert(card != NULL, return -EINVAL);
-        snd_assert(name != NULL, return -EINVAL);
+        if (snd_BUG_ON(!emu->hw || emu->max_voices <= 0))
+                return -EINVAL;
+        if (snd_BUG_ON(!card || !name))
+                return -EINVAL;
 
         emu->card = card;
         emu->name = kstrdup(name, GFP_KERNEL);
diff --git a/sound/synth/emux/emux_nrpn.c b/sound/synth/emux/emux_nrpn.c
index c6917ba2c934..00fc005ecf6e 100644
--- a/sound/synth/emux/emux_nrpn.c
+++ b/sound/synth/emux/emux_nrpn.c
@@ -289,8 +289,8 @@ snd_emux_nrpn(void *p, struct snd_midi_channel *chan,
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL, return);
-        snd_assert(chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         if (chan->control[MIDI_CTL_NONREG_PARM_NUM_MSB] == 127 &&
             chan->control[MIDI_CTL_NONREG_PARM_NUM_LSB] <= 26) {
@@ -379,8 +379,8 @@ snd_emux_sysex(void *p, unsigned char *buf, int len, int parsed,
         struct snd_emux *emu;
 
         port = p;
-        snd_assert(port != NULL, return);
-        snd_assert(chset != NULL, return);
+        if (snd_BUG_ON(!port || !chset))
+                return;
         emu = port->emu;
 
         switch (parsed) {
diff --git a/sound/synth/emux/emux_oss.c b/sound/synth/emux/emux_oss.c
index f60a98ef7dec..5c47b6c09264 100644
--- a/sound/synth/emux/emux_oss.c
+++ b/sound/synth/emux/emux_oss.c
@@ -114,7 +114,8 @@ snd_emux_open_seq_oss(struct snd_seq_oss_arg *arg, void *closure)
         char tmpname[64];
 
         emu = closure;
-        snd_assert(arg != NULL && emu != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg || !emu))
+                return -ENXIO;
 
         mutex_lock(&emu->register_mutex);
 
@@ -183,12 +184,15 @@ snd_emux_close_seq_oss(struct snd_seq_oss_arg *arg)
         struct snd_emux *emu;
         struct snd_emux_port *p;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         p = arg->private_data;
-        snd_assert(p != NULL, return -ENXIO);
+        if (snd_BUG_ON(!p))
+                return -ENXIO;
 
         emu = p->emu;
-        snd_assert(emu != NULL, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
 
         mutex_lock(&emu->register_mutex);
         snd_emux_sounds_off_all(p);
@@ -212,12 +216,15 @@ snd_emux_load_patch_seq_oss(struct snd_seq_oss_arg *arg, int format,
         struct snd_emux_port *p;
         int rc;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         p = arg->private_data;
-        snd_assert(p != NULL, return -ENXIO);
+        if (snd_BUG_ON(!p))
+                return -ENXIO;
 
         emu = p->emu;
-        snd_assert(emu != NULL, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
 
         if (format == GUS_PATCH)
                 rc = snd_soundfont_load_guspatch(emu->sflist, buf, count,
@@ -252,12 +259,15 @@ snd_emux_ioctl_seq_oss(struct snd_seq_oss_arg *arg, unsigned int cmd, unsigned l
         struct snd_emux_port *p;
         struct snd_emux *emu;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         p = arg->private_data;
-        snd_assert(p != NULL, return -ENXIO);
+        if (snd_BUG_ON(!p))
+                return -ENXIO;
 
         emu = p->emu;
-        snd_assert(emu != NULL, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
 
         switch (cmd) {
         case SNDCTL_SEQ_RESETSAMPLES:
@@ -282,9 +292,11 @@ snd_emux_reset_seq_oss(struct snd_seq_oss_arg *arg)
 {
         struct snd_emux_port *p;
 
-        snd_assert(arg != NULL, return -ENXIO);
+        if (snd_BUG_ON(!arg))
+                return -ENXIO;
         p = arg->private_data;
-        snd_assert(p != NULL, return -ENXIO);
+        if (snd_BUG_ON(!p))
+                return -ENXIO;
         snd_emux_reset_port(p);
         return 0;
 }
@@ -302,9 +314,11 @@ snd_emux_event_oss_input(struct snd_seq_event *ev, int direct, void *private_dat
         unsigned char cmd, *data;
 
         p = private_data;
-        snd_assert(p != NULL, return -EINVAL);
+        if (snd_BUG_ON(!p))
+                return -EINVAL;
         emu = p->emu;
-        snd_assert(emu != NULL, return -EINVAL);
+        if (snd_BUG_ON(!emu))
+                return -EINVAL;
         if (ev->type != SNDRV_SEQ_EVENT_OSS)
                 return snd_emux_event_input(ev, direct, private_data, atomic, hop);
 
diff --git a/sound/synth/emux/emux_seq.c b/sound/synth/emux/emux_seq.c
index d176cc01742d..335aa2ce2574 100644
--- a/sound/synth/emux/emux_seq.c
+++ b/sound/synth/emux/emux_seq.c
@@ -257,7 +257,8 @@ snd_emux_event_input(struct snd_seq_event *ev, int direct, void *private_data,
         struct snd_emux_port *port;
 
         port = private_data;
-        snd_assert(port != NULL && ev != NULL, return -EINVAL);
+        if (snd_BUG_ON(!port || !ev))
+                return -EINVAL;
 
         snd_midi_process_event(&emux_ops, ev, &port->chset);
 
@@ -308,9 +309,11 @@ snd_emux_use(void *private_data, struct snd_seq_port_subscribe *info)
         struct snd_emux *emu;
 
         p = private_data;
-        snd_assert(p != NULL, return -EINVAL);
+        if (snd_BUG_ON(!p))
+                return -EINVAL;
         emu = p->emu;
-        snd_assert(emu != NULL, return -EINVAL);
+        if (snd_BUG_ON(!emu))
+                return -EINVAL;
 
         mutex_lock(&emu->register_mutex);
         snd_emux_init_port(p);
@@ -329,9 +332,11 @@ snd_emux_unuse(void *private_data, struct snd_seq_port_subscribe *info)
         struct snd_emux *emu;
 
         p = private_data;
-        snd_assert(p != NULL, return -EINVAL);
+        if (snd_BUG_ON(!p))
+                return -EINVAL;
         emu = p->emu;
-        snd_assert(emu != NULL, return -EINVAL);
+        if (snd_BUG_ON(!emu))
+                return -EINVAL;
 
         mutex_lock(&emu->register_mutex);
         snd_emux_sounds_off_all(p);
diff --git a/sound/synth/emux/emux_synth.c b/sound/synth/emux/emux_synth.c
index b343818dbb96..2cc6f6f79065 100644
--- a/sound/synth/emux/emux_synth.c
+++ b/sound/synth/emux/emux_synth.c
@@ -66,12 +66,12 @@ snd_emux_note_on(void *p, int note, int vel, struct snd_midi_channel *chan)
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL && chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.get_voice != NULL, return);
-        snd_assert(emu->ops.trigger != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.get_voice || !emu->ops.trigger))
+                return;
 
         key = note; /* remember the original note */
         nvoices = get_zone(emu, port, &note, vel, chan, table);
@@ -164,11 +164,12 @@ snd_emux_note_off(void *p, int note, int vel, struct snd_midi_channel *chan)
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL && chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.release != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.release))
+                return;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (ch = 0; ch < emu->max_voices; ch++) {
@@ -242,11 +243,12 @@ snd_emux_key_press(void *p, int note, int vel, struct snd_midi_channel *chan)
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL && chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.update != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.update))
+                return;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (ch = 0; ch < emu->max_voices; ch++) {
@@ -276,8 +278,8 @@ snd_emux_update_channel(struct snd_emux_port *port, struct snd_midi_channel *cha
                 return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.update != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.update))
+                return;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (i = 0; i < emu->max_voices; i++) {
@@ -303,8 +305,8 @@ snd_emux_update_port(struct snd_emux_port *port, int update)
                 return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.update != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.update))
+                return;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (i = 0; i < emu->max_voices; i++) {
@@ -326,7 +328,8 @@ snd_emux_control(void *p, int type, struct snd_midi_channel *chan)
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL && chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         switch (type) {
         case MIDI_CTL_MSB_MAIN_VOLUME:
@@ -400,11 +403,12 @@ snd_emux_terminate_note(void *p, int note, struct snd_midi_channel *chan)
         struct snd_emux_port *port;
 
         port = p;
-        snd_assert(port != NULL && chan != NULL, return);
+        if (snd_BUG_ON(!port || !chan))
+                return;
 
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.terminate != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.terminate))
+                return;
 
         terminate_note1(emu, note, chan, 1);
 }
@@ -451,10 +455,11 @@ snd_emux_sounds_off_all(struct snd_emux_port *port)
         struct snd_emux_voice *vp;
         unsigned long flags;
 
-        snd_assert(port != NULL, return);
+        if (snd_BUG_ON(!port))
+                return;
         emu = port->emu;
-        snd_assert(emu != NULL, return);
-        snd_assert(emu->ops.terminate != NULL, return);
+        if (snd_BUG_ON(!emu || !emu->ops.terminate))
+                return;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (i = 0; i < emu->max_voices; i++) {
diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index deabe5f899c4..c85522e3808d 100644
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -55,7 +55,8 @@ void snd_util_memhdr_free(struct snd_util_memhdr *hdr)
 {
         struct list_head *p;
 
-        snd_assert(hdr != NULL, return);
+        if (!hdr)
+                return;
         /* release all blocks */
         while ((p = hdr->block.next) != &hdr->block) {
                 list_del(p);
@@ -74,8 +75,8 @@ __snd_util_mem_alloc(struct snd_util_memhdr *hdr, int size)
         unsigned int units, prev_offset;
         struct list_head *p;
 
-        snd_assert(hdr != NULL, return NULL);
-        snd_assert(size > 0, return NULL);
+        if (snd_BUG_ON(!hdr || size <= 0))
+                return NULL;
 
         /* word alignment */
         units = size;
@@ -161,7 +162,8 @@ __snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
  */
 int snd_util_mem_free(struct snd_util_memhdr *hdr, struct snd_util_memblk *blk)
 {
-        snd_assert(hdr && blk, return -EINVAL);
+        if (snd_BUG_ON(!hdr || !blk))
+                return -EINVAL;
 
         mutex_lock(&hdr->block_mutex);
         __snd_util_mem_free(hdr, blk);