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

[linux-2.6-omap-h63xx.git] / sound / core / seq / seq_queue.c

diff --git a/sound/core/seq/seq_queue.c b/sound/core/seq/seq_queue.c
index 9b87bb0c7f33a3f4dcf266b8d5d1236004a62c92..e7a8e9e4edb2063760607f11afcd6187f94a92b4 100644 (file)
--- a/sound/core/seq/seq_queue.c
+++ b/sound/core/seq/seq_queue.c
@@ -35,7 +35,6 @@
  *     - Addition of experimental sync support.
  */
 
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -316,7 +315,8 @@ int snd_seq_enqueue_event(struct snd_seq_event_cell *cell, int atomic, int hop)
        int dest, err;
        struct snd_seq_queue *q;
 
-       snd_assert(cell != NULL, return -EINVAL);
+       if (snd_BUG_ON(!cell))
+               return -EINVAL;
        dest = cell->event.queue;       /* destination queue */
        q = queueptr(dest);
        if (q == NULL)
@@ -735,7 +735,8 @@ int snd_seq_control_queue(struct snd_seq_event *ev, int atomic, int hop)
 {
        struct snd_seq_queue *q;
 
-       snd_assert(ev != NULL, return -EINVAL);
+       if (snd_BUG_ON(!ev))
+               return -EINVAL;
        q = queueptr(ev->data.queue.queue);
 
        if (q == NULL)