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>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
index 7583a9572bcc..10f781d8cb09 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -88,7 +88,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
         struct fs_platform_info *fpi = fep->fpi;
         int ret = -EINVAL;
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 goto out;
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
index 9ae6cdbcac2e..53a0c23b4890 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -98,7 +98,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct platform_device *ofdev = to_platform_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;
 
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
index 22a02a767069..631f09872fa2 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -98,7 +98,7 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
         struct platform_device *ofdev = to_platform_device(fep->dev);
 
-        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        fep->interrupt = irq_of_parse_and_map(ofdev->dev.of_node, 0);
         if (fep->interrupt == NO_IRQ)
                 return -EINVAL;