diff options
| author | Eric Sesterhenn <snakebyte@gmx.de> | 2006-03-24 20:53:18 +0300 |
|---|---|---|
| committer | Adrian Bunk <bunk@stusta.de> | 2006-03-24 20:53:18 +0300 |
| commit | 232443e2c90cc2930624dec89df327615b002c55 (patch) | |
| tree | 8bb1fa4c9aed6e020a8ecdb7f340ee329e2815e5 | |
| parent | b74945547f0679003ede4d1afcd0aa169059a436 (diff) | |
| download | linux-232443e2c90cc2930624dec89df327615b002c55.tar.xz | |
BUG_ON() Conversion in drivers/video/
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>
| -rw-r--r-- | drivers/video/bw2.c | 3 | ||||
| -rw-r--r-- | drivers/video/ffb.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index c029db4646f6..6577fdfdfc16 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c @@ -327,8 +327,7 @@ static void bw2_init_one(struct sbus_dev *sdev) } else #else { - if (!sdev) - BUG(); + BUG_ON(!sdev); all->par.physbase = sdev->reg_addrs[0].phys_addr; resp = &sdev->resource[0]; sbusfb_fill_var(&all->info.var, (sdev ? sdev->prom_node : 0), 1); diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 9c9b21d469a1..7633e41adda1 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c @@ -466,8 +466,7 @@ static void ffb_fillrect(struct fb_info *info, const struct fb_fillrect *rect) unsigned long flags; u32 fg; - if (rect->rop != ROP_COPY && rect->rop != ROP_XOR) - BUG(); + BUG_ON(rect->rop != ROP_COPY && rect->rop != ROP_XOR); fg = ((u32 *)info->pseudo_palette)[rect->color]; |