diff options
author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-24 12:49:12 -0500 |
---|---|---|
committer | Adrian Bunk <bunk@stusta.de> | 2006-03-24 12:49:12 -0500 |
commit | 817dd6eed4bf40fa14d1e96ac4905efebd5e03f2 (patch) | |
tree | a322cc013acfe1bde06dc58aacacb59c02cf7276 /sound | |
parent | 7ac1e877d48061aa6ebca936189c32b44ccf8d9c (diff) |
BUG_ON() Conversion in sound/sparc/cs4231.c
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/sparc/cs4231.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index 53a148b01b6b..8804f26ddb3a 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c | |||
@@ -611,8 +611,7 @@ static void snd_cs4231_advance_dma(struct cs4231_dma_control *dma_cont, | |||
611 | unsigned int period_size = snd_pcm_lib_period_bytes(substream); | 611 | unsigned int period_size = snd_pcm_lib_period_bytes(substream); |
612 | unsigned int offset = period_size * (*periods_sent); | 612 | unsigned int offset = period_size * (*periods_sent); |
613 | 613 | ||
614 | if (period_size >= (1 << 24)) | 614 | BUG_ON(period_size >= (1 << 24)); |
615 | BUG(); | ||
616 | 615 | ||
617 | if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size)) | 616 | if (dma_cont->request(dma_cont, runtime->dma_addr + offset, period_size)) |
618 | return; | 617 | return; |
@@ -1079,8 +1078,7 @@ static int snd_cs4231_playback_prepare(struct snd_pcm_substream *substream) | |||
1079 | chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | | 1078 | chip->image[CS4231_IFACE_CTRL] &= ~(CS4231_PLAYBACK_ENABLE | |
1080 | CS4231_PLAYBACK_PIO); | 1079 | CS4231_PLAYBACK_PIO); |
1081 | 1080 | ||
1082 | if (runtime->period_size > 0xffff + 1) | 1081 | BUG_ON(runtime->period_size > 0xffff + 1); |
1083 | BUG(); | ||
1084 | 1082 | ||
1085 | chip->p_periods_sent = 0; | 1083 | chip->p_periods_sent = 0; |
1086 | spin_unlock_irqrestore(&chip->lock, flags); | 1084 | spin_unlock_irqrestore(&chip->lock, flags); |