genirq: fix name space collisions of nr_irqs in arch/*

local shadows of global variables are _bad_

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

4 files changed, 13 insertions, 13 deletions

diff --git a/arch/alpha/kernel/sys_sable.c b/arch/alpha/kernel/sys_sable.c
index 99a7f19da13..a4555f49763 100644
--- a/arch/alpha/kernel/sys_sable.c
+++ b/arch/alpha/kernel/sys_sable.c
@@ -47,7 +47,7 @@ typedef struct irq_swizzle_struct
 
 static irq_swizzle_t *sable_lynx_irq_swizzle;
 
-static void sable_lynx_init_irq(int nr_irqs);
+static void sable_lynx_init_irq(int nr_of_irqs);
 
 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_SABLE)
 
@@ -530,11 +530,11 @@ sable_lynx_srm_device_interrupt(unsigned long vector)
 }
 
 static void __init
-sable_lynx_init_irq(int nr_irqs)
+sable_lynx_init_irq(int nr_of_irqs)
 {
         long i;
 
-        for (i = 0; i < nr_irqs; ++i) {
+        for (i = 0; i < nr_of_irqs; ++i) {
                 irq_desc[i].status = IRQ_DISABLED | IRQ_LEVEL;
                 irq_desc[i].chip = &sable_lynx_irq_type;
         }
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c
index b0653a87159..30451300751 100644
--- a/arch/arm/mach-ixp2000/ixdp2x00.c
+++ b/arch/arm/mach-ixp2000/ixdp2x00.c
@@ -143,7 +143,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = {
         .unmask = ixdp2x00_irq_unmask
 };
 
-void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs)
+void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_of_irqs)
 {
         unsigned int irq;
 
@@ -154,7 +154,7 @@ void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigne
 
         board_irq_stat = stat_reg;
         board_irq_mask = mask_reg;
-        board_irq_count = nr_irqs;
+        board_irq_count = nr_of_irqs;
 
         *board_irq_mask = 0xffffffff;
 
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index 196a9565a8d..003901f1e2d 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -111,7 +111,7 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
 
 void __init omap_init_irq(void)
 {
-        unsigned long nr_irqs = 0;
+        unsigned long nr_of_irqs = 0;
         unsigned int nr_banks = 0;
         int i;
 
@@ -124,14 +124,14 @@ void __init omap_init_irq(void)
 
                 omap_irq_bank_init_one(bank);
 
-                nr_irqs += bank->nr_irqs;
+                nr_of_irqs += bank->nr_irqs;
                 nr_banks++;
         }
 
         printk(KERN_INFO "Total of %ld interrupts on %d active controller%s\n",
-               nr_irqs, nr_banks, nr_banks > 1 ? "s" : "");
+               nr_of_irqs, nr_banks, nr_banks > 1 ? "s" : "");
 
-        for (i = 0; i < nr_irqs; i++) {
+        for (i = 0; i < nr_of_irqs; i++) {
                 set_irq_chip(i, &omap_irq_chip);
                 set_irq_handler(i, handle_level_irq);
                 set_irq_flags(i, IRQF_VALID);
diff --git a/arch/avr32/mach-at32ap/extint.c b/arch/avr32/mach-at32ap/extint.c
index c36a6d59d6f..310477ba1bb 100644
--- a/arch/avr32/mach-at32ap/extint.c
+++ b/arch/avr32/mach-at32ap/extint.c
@@ -191,7 +191,7 @@ static int __init eic_probe(struct platform_device *pdev)
         struct eic *eic;
         struct resource *regs;
         unsigned int i;
-        unsigned int nr_irqs;
+        unsigned int nr_of_irqs;
         unsigned int int_irq;
         int ret;
         u32 pattern;
@@ -224,7 +224,7 @@ static int __init eic_probe(struct platform_device *pdev)
         eic_writel(eic, IDR, ~0UL);
         eic_writel(eic, MODE, ~0UL);
         pattern = eic_readl(eic, MODE);
-        nr_irqs = fls(pattern);
+        nr_of_irqs = fls(pattern);
 
         /* Trigger on low level unless overridden by driver */
         eic_writel(eic, EDGE, 0UL);
@@ -232,7 +232,7 @@ static int __init eic_probe(struct platform_device *pdev)
 
         eic->chip = &eic_chip;
 
-        for (i = 0; i < nr_irqs; i++) {
+        for (i = 0; i < nr_of_irqs; i++) {
                 set_irq_chip_and_handler(eic->first_irq + i, &eic_chip,
                                          handle_level_irq);
                 set_irq_chip_data(eic->first_irq + i, eic);
@@ -256,7 +256,7 @@ static int __init eic_probe(struct platform_device *pdev)
                  eic->regs, int_irq);
         dev_info(&pdev->dev,
                  "Handling %u external IRQs, starting with IRQ %u\n",
-                 nr_irqs, eic->first_irq);
+                 nr_of_irqs, eic->first_irq);
 
         return 0;