ARM: OMAP2+: fix naming collision of variable nr_irqs

Using nr_irqs as local variable name triggers the sparse warning..
./arch/arm/mach-omap2/irq.c:265:6: warning: symbol 'nr_irqs' shadows an earlier one
./linux/include/linux/irqnr.h:26:12: originally declared here

Signed-off-by: Venkatraman S <svenkatr@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index dfe00ddb5c60..534d732caa1e 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -85,7 +85,7 @@ static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)
         unsigned long priority_pending[OMAP_PRCM_MAX_NR_PENDING_REG];
         struct irq_chip *chip = irq_desc_get_chip(desc);
         unsigned int virtirq;
-        int nr_irqs = prcm_irq_setup->nr_regs * 32;
+        int nr_irq = prcm_irq_setup->nr_regs * 32;
 
         /*
          * If we are suspended, mask all interrupts from PRCM level,
@@ -110,7 +110,7 @@ static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)
                 prcm_irq_setup->read_pending_irqs(pending);
 
                 /* No bit set, then all IRQs are handled */
-                if (find_first_bit(pending, nr_irqs) >= nr_irqs)
+                if (find_first_bit(pending, nr_irq) >= nr_irq)
                         break;
 
                 omap_prcm_events_filter_priority(pending, priority_pending);
@@ -121,11 +121,11 @@ static void omap_prcm_irq_handler(unsigned int irq, struct irq_desc *desc)
                  */
 
                 /* Serve priority events first */
-                for_each_set_bit(virtirq, priority_pending, nr_irqs)
+                for_each_set_bit(virtirq, priority_pending, nr_irq)
                         generic_handle_irq(prcm_irq_setup->base_irq + virtirq);
 
                 /* Serve normal events next */
-                for_each_set_bit(virtirq, pending, nr_irqs)
+                for_each_set_bit(virtirq, pending, nr_irq)
                         generic_handle_irq(prcm_irq_setup->base_irq + virtirq);
         }
         if (chip->irq_ack)