Merge remote-tracking branch 'grant/devicetree/next' into for-next

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 005c2e06b8c0..f8b92864fc52 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
@@ -90,7 +90,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 8aac2316d0f3..a9a00f39521a 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -100,7 +100,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 e151784c5ebd..d37cd4ebac65 100644
--- a/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+++ b/drivers/net/ethernet/freescale/fs_enet/mac-scc.c
@@ -100,7 +100,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;