BUG_ON() Conversion in sound/sparc/cs4231.c
authorEric Sesterhenn <snakebyte@gmx.de>
Fri, 24 Mar 2006 17:49:12 +0000 (18:49 +0100)
committerAdrian Bunk <bunk@stusta.de>
Fri, 24 Mar 2006 17:49:12 +0000 (18:49 +0100)
this changes if() BUG(); constructs to BUG_ON() which is
cleaner, contains unlikely() and can better optimized away.

Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
sound/sparc/cs4231.c

index 53a148b..8804f26 100644 (file)
@@ -611,8 +611,7 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont,
                unsigned int period_size = snd_pcm_lib_period_bytes(substream);
                unsigned int offset = period_size * (*periods_sent);
 
-               if (period_size >= (1 << 24))
-                       BUG();
+               BUG_ON(period_size >= (1 << 24));
 
                if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size))
                        return;
@@ -1079,8 +1078,7 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream)
        chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE |
                                            CS4231_PLAYBACK_PIO);
 
-       if (runtime->period_size > 0xffff + 1)
-               BUG();
+       BUG_ON(runtime->period_size > 0xffff + 1);
 
        chip->p_periods_sent = 0;
        spin_unlock_irqrestore(&chip->lock, flags);