1 files changed, 6 insertions, 7 deletions

diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c
index 9a0f7632c47c..b372787886ed 100644
--- a/arch/microblaze/kernel/of_device.c
+++ b/arch/microblaze/kernel/of_device.c
@@ -12,7 +12,7 @@
 void of_device_make_bus_id(struct of_device *dev)
 {
         static atomic_t bus_no_reg_magic;
-        struct device_node *node = dev->node;
+        struct device_node *node = dev->dev.of_node;
         const u32 *reg;
         u64 addr;
         int magic;
@@ -49,11 +49,10 @@ struct of_device *of_device_alloc(struct device_node *np,
         if (!dev)
                 return NULL;
 
-        dev->node = of_node_get(np);
-        dev->dev.dma_mask = &dev->dma_mask;
+        dev->dev.of_node = of_node_get(np);
+        dev->dev.dma_mask = &dev->archdata.dma_mask;
         dev->dev.parent = parent;
         dev->dev.release = of_release_dev;
-        dev->dev.archdata.of_node = np;
 
         if (bus_id)
                 dev_set_name(&dev->dev, bus_id);
@@ -75,17 +74,17 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 
         ofdev = to_of_device(dev);
 
-        if (add_uevent_var(env, "OF_NAME=%s", ofdev->node->name))
+        if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name))
                 return -ENOMEM;
 
-        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->node->type))
+        if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type))
                 return -ENOMEM;
 
         /* Since the compatible field can contain pretty much anything
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
         while (compat && *compat && cplen > 0) {
                 if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat))
                         return -ENOMEM;