diff options
author | Venkatraman S <svenkatr@ti.com> | 2012-06-25 06:26:39 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-06-28 03:08:04 -0400 |
commit | b56f2cb71a73618c97721762feb0a1be81302e22 (patch) | |
tree | d9aa4118f8acbbd5ec46751c8faf57757d6cdba3 /arch/arm/mach-omap2/irq.c | |
parent | d3ada72ee3a479acbfb718302ca8b87d9d6e5e60 (diff) |
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, | |||
261 | struct device_node *parent) | 261 | struct device_node *parent) |
262 | { | 262 | { |
263 | struct resource res; | 263 | struct resource res; |
264 | u32 nr_irqs = 96; | 264 | u32 nr_irq = 96; |
265 | 265 | ||
266 | if (WARN_ON(!node)) | 266 | if (WARN_ON(!node)) |
267 | return -ENODEV; | 267 | return -ENODEV; |
@@ -271,10 +271,10 @@ int __init omap_intc_of_init(struct device_node *node, | |||
271 | return -EINVAL; | 271 | return -EINVAL; |
272 | } | 272 | } |
273 | 273 | ||
274 | if (of_property_read_u32(node, "ti,intc-size", &nr_irqs)) | 274 | if (of_property_read_u32(node, "ti,intc-size", &nr_irq)) |
275 | pr_warn("unable to get intc-size, default to %d\n", nr_irqs); | 275 | pr_warn("unable to get intc-size, default to %d\n", nr_irq); |
276 | 276 | ||
277 | omap_init_irq(res.start, nr_irqs, of_node_get(node)); | 277 | omap_init_irq(res.start, nr_irq, of_node_get(node)); |
278 | 278 | ||
279 | return 0; | 279 | return 0; |
280 | } | 280 | } |