aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/DAC960.c
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-03-24 18:50:27 +0100
committerAdrian Bunk <bunk@stusta.de>2006-03-24 18:50:27 +0100
commit089fe1b23da5468bbf02b721472f71f349837a7d (patch)
treec5b385dff1ca5dc259e9ec08c0a7392947ae3818 /drivers/block/DAC960.c
parentBUG_ON() Conversion in sound/sparc/cs4231.c (diff)
downloadlinux-dev-089fe1b23da5468bbf02b721472f71f349837a7d.tar.xz
linux-dev-089fe1b23da5468bbf02b721472f71f349837a7d.zip
BUG_ON() Conversion in drivers/block/
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 'drivers/block/DAC960.c')
-rw-r--r--drivers/block/DAC960.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index 37b8cda3e8bc..9bdea2a5cf0e 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -228,8 +228,7 @@ static void *slice_dma_loaf(struct dma_loaf *loaf, size_t len,
void *cpu_end = loaf->cpu_free + len;
void *cpu_addr = loaf->cpu_free;
- if (cpu_end > loaf->cpu_base + loaf->length)
- BUG();
+ BUG_ON(cpu_end > loaf->cpu_base + loaf->length);
*dma_handle = loaf->dma_free;
loaf->cpu_free = cpu_end;
loaf->dma_free += len;