Merge remote branch 'origin' into secretlab/next-devicetree

[firefly-linux-kernel-4.4.55.git] / drivers / net / fs_enet / mac-fec.c

diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 7eff92ef01da4de9e28857cfbe0a5c69f4789b41..7ca1642276d02e44949a966f3107c7b36c82ea03 100644 (file)
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -98,11 +98,11 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
        struct of_device *ofdev = to_of_device(fep->dev);
 
-       fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+       fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (fep->interrupt == NO_IRQ)
                return -EINVAL;
 
-       fep->fec.fecp = of_iomap(ofdev->node, 0);
+       fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0);
        if (!fep->fcc.fccp)
                return -EINVAL;