3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/of/device.c b/drivers/of/device.c
index 224ae6bc67b6..24068bbbce1a 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -21,9 +21,9 @@
 const struct of_device_id *of_match_device(const struct of_device_id *matches,
                                         const struct of_device *dev)
 {
-        if (!dev->node)
+        if (!dev->dev.of_node)
                 return NULL;
-        return of_match_node(matches, dev->node);
+        return of_match_node(matches, dev->dev.of_node);
 }
 EXPORT_SYMBOL(of_match_device);
 
@@ -54,7 +54,7 @@ static ssize_t devspec_show(struct device *dev,
         struct of_device *ofdev;
 
         ofdev = to_of_device(dev);
-        return sprintf(buf, "%s\n", ofdev->node->full_name);
+        return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
 }
 
 static ssize_t name_show(struct device *dev,
@@ -63,7 +63,7 @@ static ssize_t name_show(struct device *dev,
         struct of_device *ofdev;
 
         ofdev = to_of_device(dev);
-        return sprintf(buf, "%s\n", ofdev->node->name);
+        return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
 }
 
 static ssize_t modalias_show(struct device *dev,
@@ -97,14 +97,14 @@ void of_release_dev(struct device *dev)
         struct of_device *ofdev;
 
         ofdev = to_of_device(dev);
-        of_node_put(ofdev->node);
+        of_node_put(ofdev->dev.of_node);
         kfree(ofdev);
 }
 EXPORT_SYMBOL(of_release_dev);
 
 int of_device_register(struct of_device *ofdev)
 {
-        BUG_ON(ofdev->node == NULL);
+        BUG_ON(ofdev->dev.of_node == NULL);
 
         device_initialize(&ofdev->dev);
 
@@ -112,7 +112,7 @@ int of_device_register(struct of_device *ofdev)
          * the parent. If there is no parent defined, set the node
          * explicitly */
         if (!ofdev->dev.parent)
-                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node));
+                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
 
         return device_add(&ofdev->dev);
 }
@@ -132,11 +132,11 @@ ssize_t of_device_get_modalias(struct of_device *ofdev,
         ssize_t tsize, csize, repend;
 
         /* Name & Type */
-        csize = snprintf(str, len, "of:N%sT%s",
-                                ofdev->node->name, ofdev->node->type);
+        csize = snprintf(str, len, "of:N%sT%s", ofdev->dev.of_node->name,
+                         ofdev->dev.of_node->type);
 
         /* Get compatible property if any */
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
         if (!compat)
                 return csize;
 
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index e690a2aa6fef..604ba966e1c9 100644
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -69,7 +69,7 @@ EXPORT_SYMBOL(of_register_i2c_devices);
 
 static int of_dev_node_match(struct device *dev, void *data)
 {
-        return dev_archdata_get_node(&dev->archdata) == data;
+        return dev->of_node == data;
 }
 
 /* must call put_device() when done with returned i2c_client device */
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index 12090f57dc87..01d794abe105 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -101,7 +101,7 @@ EXPORT_SYMBOL(of_mdiobus_register);
 /* Helper function for of_phy_find_device */
 static int of_phy_match(struct device *dev, void *phy_np)
 {
-        return dev_archdata_get_node(&dev->archdata) == phy_np;
+        return dev->of_node == phy_np;
 }
 
 /**
@@ -167,7 +167,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
         if (!dev->dev.parent)
                 return NULL;
 
-        net_np = dev_archdata_get_node(&dev->dev.parent->archdata);
+        net_np = dev->dev.parent->of_node;
         if (!net_np)
                 return NULL;