Skip to content

Commit

Permalink
BUG_ON() Conversion in sound/sparc/cs4231.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Sesterhenn authored and Adrian Bunk committed Mar 24, 2006
1 parent 7ac1e87 commit 817dd6e
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions sound/sparc/cs4231.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 817dd6e

Please sign in to comment.