of/irq: Use irq_of_parse_and_map()

Replace some instances of of_irq_map_one()/irq_create_of_mapping() and
of_irq_to_resource() by the simpler equivalent irq_of_parse_and_map().

Signed-off-by: Thierry Reding <treding@nvidia.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
[grant.likely: resolved conflicts with core code renames]
Signed-off-by: Grant Likely <grant.likely@linaro.org>

1 files changed, 4 insertions, 5 deletions

diff --git a/arch/arm/mach-u300/timer.c b/arch/arm/mach-u300/timer.c
index b5db207dfd1e..9a5f9fb352ce 100644
--- a/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@ -358,8 +358,7 @@ static struct delay_timer u300_delay_timer;
  */
 static void __init u300_timer_init_of(struct device_node *np)
 {
-        struct resource irq_res;
-        int irq;
+        unsigned int irq;
         struct clk *clk;
         unsigned long rate;
 
@@ -368,11 +367,11 @@ static void __init u300_timer_init_of(struct device_node *np)
                 panic("could not ioremap system timer\n");
 
         /* Get the IRQ for the GP1 timer */
-        irq = of_irq_to_resource(np, 2, &irq_res);
-        if (irq <= 0)
+        irq = irq_of_parse_and_map(np, 2);
+        if (!irq)
                 panic("no IRQ for system timer\n");
 
-        pr_info("U300 GP1 timer @ base: %p, IRQ: %d\n", u300_timer_base, irq);
+        pr_info("U300 GP1 timer @ base: %p, IRQ: %u\n", u300_timer_base, irq);
 
         /* Clock the interrupt controller */
         clk = of_clk_get(np, 0);