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>

diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index c029db4..6577fdf 100644 (file)
--- 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 9c9b21d..7633e41 100644 (file)
--- 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];