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>

2 files changed, 6 insertions, 9 deletions

diff --git a/arch/powerpc/sysdev/fsl_gtm.c b/arch/powerpc/sysdev/fsl_gtm.c
index 0eb871cc3437..dd0d5be6cd1f 100644
--- a/arch/powerpc/sysdev/fsl_gtm.c
+++ b/arch/powerpc/sysdev/fsl_gtm.c
@@ -401,16 +401,15 @@ static int __init fsl_gtm_init(void)
                 gtm->clock = *clock;
 
                 for (i = 0; i < ARRAY_SIZE(gtm->timers); i++) {
-                        int ret;
-                        struct resource irq;
+                        unsigned int irq;
 
-                        ret = of_irq_to_resource(np, i, &irq);
-                        if (ret == NO_IRQ) {
+                        irq = irq_of_parse_and_map(np, i);
+                        if (irq == NO_IRQ) {
                                 pr_err("%s: not enough interrupts specified\n",
                                        np->full_name);
                                 goto err;
                         }
-                        gtm->timers[i].irq = irq.start;
+                        gtm->timers[i].irq = irq;
                         gtm->timers[i].gtm = gtm;
                 }
 
diff --git a/arch/powerpc/sysdev/mpic_msgr.c b/arch/powerpc/sysdev/mpic_msgr.c
index c75325865a85..2c9b52aa266c 100644
--- a/arch/powerpc/sysdev/mpic_msgr.c
+++ b/arch/powerpc/sysdev/mpic_msgr.c
@@ -237,15 +237,13 @@ static int mpic_msgr_probe(struct platform_device *dev)
                 raw_spin_lock_init(&msgr->lock);
 
                 if (receive_mask & (1 << i)) {
-                        struct resource irq;
-
-                        if (of_irq_to_resource(np, irq_index, &irq) == NO_IRQ) {
+                        msgr->irq = irq_of_parse_and_map(np, irq_index);
+                        if (msgr->irq == NO_IRQ) {
                                 dev_err(&dev->dev,
                                                 "Missing interrupt specifier");
                                 kfree(msgr);
                                 return -EFAULT;
                         }
-                        msgr->irq = irq.start;
                         irq_index += 1;
                 } else {
                         msgr->irq = NO_IRQ;