diff options
| author | Venkatraman S <svenkatr@ti.com> | 2012-06-25 12:26:39 +0200 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 09:08:04 +0200 |
| commit | b56f2cb71a73618c97721762feb0a1be81302e22 (patch) | |
| tree | d9aa4118f8acbbd5ec46751c8faf57757d6cdba3 /arch/arm/mach-omap2/irq.c | |
| parent | ARM: OMAP: omap2plus_defconfig: Enable EXT4 support (diff) | |
| download | linux-b56f2cb71a73618c97721762feb0a1be81302e22.tar.xz linux-b56f2cb71a73618c97721762feb0a1be81302e22.zip | |
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>
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index fdc4303be563..74d77e008025 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -261,7 +261,7 @@ int __init omap_intc_of_init(struct device_node *node, struct device_node *parent) { struct resource res; - u32 nr_irqs = 96; + u32 nr_irq = 96; if (WARN_ON(!node)) return -ENODEV; @@ -271,10 +271,10 @@ int __init omap_intc_of_init(struct device_node *node, return -EINVAL; } - if (of_property_read_u32(node, "ti,intc-size", &nr_irqs)) - pr_warn("unable to get intc-size, default to %d\n", nr_irqs); + if (of_property_read_u32(node, "ti,intc-size", &nr_irq)) + pr_warn("unable to get intc-size, default to %d\n", nr_irq); - omap_init_irq(res.start, nr_irqs, of_node_get(node)); + omap_init_irq(res.start, nr_irq, of_node_get(node)); return 0; } |