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

Kill snd_assert() in sound/pci/*, 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>

7 files changed, 65 insertions, 34 deletions

diff --git a/sound/pci/emu10k1/emu10k1_callback.c b/sound/pci/emu10k1/emu10k1_callback.c
index 45088ebcce50..0e649dcdbf64 100644
--- a/sound/pci/emu10k1/emu10k1_callback.c
+++ b/sound/pci/emu10k1/emu10k1_callback.c
@@ -145,7 +145,8 @@ terminate_voice(struct snd_emux_voice *vp)
 {
         struct snd_emu10k1 *hw;
         
-        snd_assert(vp, return);
+        if (snd_BUG_ON(!vp))
+                return;
         hw = vp->hw;
         snd_emu10k1_ptr_write(hw, DCYSUSV, vp->ch, 0x807f | DCYSUSV_CHANNELENABLE_MASK);
         if (vp->block) {
@@ -325,7 +326,8 @@ start_voice(struct snd_emux_voice *vp)
         
         hw = vp->hw;
         ch = vp->ch;
-        snd_assert(ch >= 0, return -EINVAL);
+        if (snd_BUG_ON(ch < 0))
+                return -EINVAL;
         chan = vp->chan;
 
         emem = (struct snd_emu10k1_memblk *)vp->block;
diff --git a/sound/pci/emu10k1/emu10k1_patch.c b/sound/pci/emu10k1/emu10k1_patch.c
index 42bae6f7e9a4..e10f027bde03 100644
--- a/sound/pci/emu10k1/emu10k1_patch.c
+++ b/sound/pci/emu10k1/emu10k1_patch.c
@@ -46,8 +46,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
         struct snd_emu10k1 *emu;
 
         emu = rec->hw;
-        snd_assert(sp != NULL, return -EINVAL);
-        snd_assert(hdr != NULL, return -EINVAL);
+        if (snd_BUG_ON(!sp || !hdr))
+                return -EINVAL;
 
         if (sp->v.size == 0) {
                 snd_printd("emu: rom font for sample %d\n", sp->v.sample);
@@ -104,7 +104,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
         size = BLANK_HEAD_SIZE;
         if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
                 size *= 2;
-        snd_assert(offset + size <= blocksize, return -EINVAL);
+        if (offset + size > blocksize)
+                return -EINVAL;
         snd_emu10k1_synth_bzero(emu, sp->block, offset, size);
         offset += size;
 
@@ -112,7 +113,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
         size = loopend;
         if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
                 size *= 2;
-        snd_assert(offset + size <= blocksize, return -EINVAL);
+        if (offset + size > blocksize)
+                return -EINVAL;
         if (snd_emu10k1_synth_copy_from_user(emu, sp->block, offset, data, size)) {
                 snd_emu10k1_synth_free(emu, sp->block);
                 sp->block = NULL;
@@ -129,12 +131,14 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
                         int woffset;
                         unsigned short *wblock = (unsigned short*)block;
                         woffset = offset / 2;
-                        snd_assert(offset + loopsize*2 <= blocksize, return -EINVAL);
+                        if (offset + loopsize * 2 > blocksize)
+                                return -EINVAL;
                         for (i = 0; i < loopsize; i++)
                                 wblock[woffset + i] = wblock[woffset - i -1];
                         offset += loopsize * 2;
                 } else {
-                        snd_assert(offset + loopsize <= blocksize, return -EINVAL);
+                        if (offset + loopsize > blocksize)
+                                return -EINVAL;
                         for (i = 0; i < loopsize; i++)
                                 block[offset + i] = block[offset - i -1];
                         offset += loopsize;
@@ -154,7 +158,8 @@ snd_emu10k1_sample_new(struct snd_emux *rec, struct snd_sf_sample *sp,
 
         /* loopend -> sample end */
         size = sp->v.size - loopend;
-        snd_assert(size >= 0, return -EINVAL);
+        if (size < 0)
+                return -EINVAL;
         if (! (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS))
                 size *= 2;
         if (snd_emu10k1_synth_copy_from_user(emu, sp->block, offset, data, size)) {
@@ -212,8 +217,8 @@ snd_emu10k1_sample_free(struct snd_emux *rec, struct snd_sf_sample *sp,
         struct snd_emu10k1 *emu;
 
         emu = rec->hw;
-        snd_assert(sp != NULL, return -EINVAL);
-        snd_assert(hdr != NULL, return -EINVAL);
+        if (snd_BUG_ON(!sp || !hdr))
+                return -EINVAL;
 
         if (sp->block) {
                 snd_emu10k1_synth_free(emu, sp->block);
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index 491a4a50f869..5ff4dbb62dad 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -1319,7 +1319,8 @@ static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)
         unsigned long flags;
         
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1X_MIDI_MODE_INPUT;
         midi->substream_input = substream;
@@ -1345,7 +1346,8 @@ static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1X_MIDI_MODE_OUTPUT;
         midi->substream_output = substream;
@@ -1372,7 +1374,8 @@ static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1x_intr_disable(emu, midi->rx_enable);
         midi->midi_mode &= ~EMU10K1X_MIDI_MODE_INPUT;
@@ -1394,7 +1397,8 @@ static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substrea
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1x_intr_disable(emu, midi->tx_enable);
         midi->midi_mode &= ~EMU10K1X_MIDI_MODE_OUTPUT;
@@ -1413,7 +1417,8 @@ static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substr
         struct emu10k1x *emu;
         struct emu10k1x_midi *midi = substream->rmidi->private_data;
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up)
                 snd_emu10k1x_intr_enable(emu, midi->rx_enable);
@@ -1428,7 +1433,8 @@ static void snd_emu10k1x_midi_output_trigger(struct snd_rawmidi_substream *subst
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up) {
                 int max = 4;
diff --git a/sound/pci/emu10k1/emufx.c b/sound/pci/emu10k1/emufx.c
index 71dc4c8865b8..7dba08f0ab8e 100644
--- a/sound/pci/emu10k1/emufx.c
+++ b/sound/pci/emu10k1/emufx.c
@@ -487,7 +487,8 @@ static void snd_emu10k1_write_op(struct snd_emu10k1_fx8010_code *icode,
                                  u32 op, u32 r, u32 a, u32 x, u32 y)
 {
         u_int32_t *code;
-        snd_assert(*ptr < 512, return);
+        if (snd_BUG_ON(*ptr >= 512))
+                return;
         code = (u_int32_t __force *)icode->code + (*ptr) * 2;
         set_bit(*ptr, icode->code_valid);
         code[0] = ((x & 0x3ff) << 10) | (y & 0x3ff);
@@ -503,7 +504,8 @@ static void snd_emu10k1_audigy_write_op(struct snd_emu10k1_fx8010_code *icode,
                                         u32 op, u32 r, u32 a, u32 x, u32 y)
 {
         u_int32_t *code;
-        snd_assert(*ptr < 1024, return);
+        if (snd_BUG_ON(*ptr >= 1024))
+                return;
         code = (u_int32_t __force *)icode->code + (*ptr) * 2;
         set_bit(*ptr, icode->code_valid);
         code[0] = ((x & 0x7ff) << 12) | (y & 0x7ff);
diff --git a/sound/pci/emu10k1/emumpu401.c b/sound/pci/emu10k1/emumpu401.c
index c4d76d16661e..8578c70c61f2 100644
--- a/sound/pci/emu10k1/emumpu401.c
+++ b/sound/pci/emu10k1/emumpu401.c
@@ -157,7 +157,8 @@ static int snd_emu10k1_midi_input_open(struct snd_rawmidi_substream *substream)
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1_MIDI_MODE_INPUT;
         midi->substream_input = substream;
@@ -183,7 +184,8 @@ static int snd_emu10k1_midi_output_open(struct snd_rawmidi_substream *substream)
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         midi->midi_mode |= EMU10K1_MIDI_MODE_OUTPUT;
         midi->substream_output = substream;
@@ -210,7 +212,8 @@ static int snd_emu10k1_midi_input_close(struct snd_rawmidi_substream *substream)
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1_intr_disable(emu, midi->rx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_INPUT;
@@ -232,7 +235,8 @@ static int snd_emu10k1_midi_output_close(struct snd_rawmidi_substream *substream
         int err = 0;
 
         emu = midi->emu;
-        snd_assert(emu, return -ENXIO);
+        if (snd_BUG_ON(!emu))
+                return -ENXIO;
         spin_lock_irqsave(&midi->open_lock, flags);
         snd_emu10k1_intr_disable(emu, midi->tx_enable);
         midi->midi_mode &= ~EMU10K1_MIDI_MODE_OUTPUT;
@@ -251,7 +255,8 @@ static void snd_emu10k1_midi_input_trigger(struct snd_rawmidi_substream *substre
         struct snd_emu10k1 *emu;
         struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up)
                 snd_emu10k1_intr_enable(emu, midi->rx_enable);
@@ -266,7 +271,8 @@ static void snd_emu10k1_midi_output_trigger(struct snd_rawmidi_substream *substr
         unsigned long flags;
 
         emu = midi->emu;
-        snd_assert(emu, return);
+        if (snd_BUG_ON(!emu))
+                return;
 
         if (up) {
                 int max = 4;
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c
index 7d379f5131fb..e8ad56ed34fa 100644
--- a/sound/pci/emu10k1/memory.c
+++ b/sound/pci/emu10k1/memory.c
@@ -107,7 +107,8 @@ static int search_empty_map_area(struct snd_emu10k1 *emu, int npages, struct lis
 
         list_for_each (pos, &emu->mapped_link_head) {
                 struct snd_emu10k1_memblk *blk = get_emu10k1_memblk(pos, mapped_link);
-                snd_assert(blk->mapped_page >= 0, continue);
+                if (blk->mapped_page < 0)
+                        continue;
                 size = blk->mapped_page - page;
                 if (size == npages) {
                         *nextp = pos;
@@ -300,10 +301,14 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
         struct snd_emu10k1_memblk *blk;
         int page, err, idx;
 
-        snd_assert(emu, return NULL);
-        snd_assert(runtime->dma_bytes > 0 && runtime->dma_bytes < MAXPAGES * EMUPAGESIZE, return NULL);
+        if (snd_BUG_ON(!emu))
+                return NULL;
+        if (snd_BUG_ON(runtime->dma_bytes <= 0 ||
+                       runtime->dma_bytes >= MAXPAGES * EMUPAGESIZE))
+                return NULL;
         hdr = emu->memhdr;
-        snd_assert(hdr, return NULL);
+        if (snd_BUG_ON(!hdr))
+                return NULL;
 
         mutex_lock(&hdr->block_mutex);
         blk = search_empty(emu, runtime->dma_bytes);
@@ -353,7 +358,8 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst
  */
 int snd_emu10k1_free_pages(struct snd_emu10k1 *emu, struct snd_util_memblk *blk)
 {
-        snd_assert(emu && blk, return -EINVAL);
+        if (snd_BUG_ON(!emu || !blk))
+                return -EINVAL;
         return snd_emu10k1_synth_free(emu, blk);
 }
 
@@ -498,7 +504,8 @@ static int synth_free_pages(struct snd_emu10k1 *emu, struct snd_emu10k1_memblk *
 static inline void *offset_ptr(struct snd_emu10k1 *emu, int page, int offset)
 {
         char *ptr;
-        snd_assert(page >= 0 && page < emu->max_cache_pages, return NULL);
+        if (snd_BUG_ON(page < 0 || page >= emu->max_cache_pages))
+                return NULL;
         ptr = emu->page_ptr_table[page];
         if (! ptr) {
                 printk(KERN_ERR "emu10k1: access to NULL ptr: page = %d\n", page);
diff --git a/sound/pci/emu10k1/voice.c b/sound/pci/emu10k1/voice.c
index 958cb2a65a4e..d7300a1aa262 100644
--- a/sound/pci/emu10k1/voice.c
+++ b/sound/pci/emu10k1/voice.c
@@ -111,8 +111,10 @@ int snd_emu10k1_voice_alloc(struct snd_emu10k1 *emu, int type, int number,
         unsigned long flags;
         int result;
 
-        snd_assert(rvoice != NULL, return -EINVAL);
-        snd_assert(number, return -EINVAL);
+        if (snd_BUG_ON(!rvoice))
+                return -EINVAL;
+        if (snd_BUG_ON(!number))
+                return -EINVAL;
 
         spin_lock_irqsave(&emu->voice_lock, flags);
         for (;;) {
@@ -145,7 +147,8 @@ int snd_emu10k1_voice_free(struct snd_emu10k1 *emu,
 {
         unsigned long flags;
 
-        snd_assert(pvoice != NULL, return -EINVAL);
+        if (snd_BUG_ON(!pvoice))
+                return -EINVAL;
         spin_lock_irqsave(&emu->voice_lock, flags);
         pvoice->interrupt = NULL;
         pvoice->use = pvoice->pcm = pvoice->synth = pvoice->midi = pvoice->efx = 0;