Use BUG_ON(condition) instead of if(condition)/BUG()
As given in scripts/coccinelle/misc/bugon.cocci

Signed-off-by: Maninder Singh <[email protected]>
Reviewed-by: Vaneet Narang <[email protected]>
---
 drivers/irqchip/irq-gic.c |   18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 8d7e1c8..b222c7b 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -329,8 +329,7 @@ static struct irq_chip gic_chip = {
 
 void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)
 {
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
        if (irq_set_handler_data(irq, &gic_data[gic_nr]) != 0)
                BUG();
        irq_set_chained_handler(irq, gic_handle_cascade_irq);
@@ -444,8 +443,7 @@ static void gic_dist_save(unsigned int gic_nr)
        void __iomem *dist_base;
        int i;
 
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
 
        gic_irqs = gic_data[gic_nr].gic_irqs;
        dist_base = gic_data_dist_base(&gic_data[gic_nr]);
@@ -479,8 +477,7 @@ static void gic_dist_restore(unsigned int gic_nr)
        unsigned int i;
        void __iomem *dist_base;
 
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
 
        gic_irqs = gic_data[gic_nr].gic_irqs;
        dist_base = gic_data_dist_base(&gic_data[gic_nr]);
@@ -516,8 +513,7 @@ static void gic_cpu_save(unsigned int gic_nr)
        void __iomem *dist_base;
        void __iomem *cpu_base;
 
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
 
        dist_base = gic_data_dist_base(&gic_data[gic_nr]);
        cpu_base = gic_data_cpu_base(&gic_data[gic_nr]);
@@ -542,8 +538,7 @@ static void gic_cpu_restore(unsigned int gic_nr)
        void __iomem *dist_base;
        void __iomem *cpu_base;
 
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
 
        dist_base = gic_data_dist_base(&gic_data[gic_nr]);
        cpu_base = gic_data_cpu_base(&gic_data[gic_nr]);
@@ -699,8 +694,7 @@ void gic_migrate_target(unsigned int new_cpu_id)
        int i, ror_val, cpu = smp_processor_id();
        u32 val, cur_target_mask, active_mask;
 
-       if (gic_nr >= MAX_GIC_NR)
-               BUG();
+       BUG_ON(gic_nr >= MAX_GIC_NR);
 
        dist_base = gic_data_dist_base(&gic_data[gic_nr]);
        if (!dist_base)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to