diff options
Diffstat (limited to 'arch/microblaze/kernel/of_device.c')
-rw-r--r-- | arch/microblaze/kernel/of_device.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/microblaze/kernel/of_device.c b/arch/microblaze/kernel/of_device.c index f6c521898ebf..90d2246e15c0 100644 --- a/arch/microblaze/kernel/of_device.c +++ b/arch/microblaze/kernel/of_device.c | |||
@@ -12,7 +12,7 @@ | |||
12 | void of_device_make_bus_id(struct of_device *dev) | 12 | void of_device_make_bus_id(struct of_device *dev) |
13 | { | 13 | { |
14 | static atomic_t bus_no_reg_magic; | 14 | static atomic_t bus_no_reg_magic; |
15 | struct device_node *node = dev->node; | 15 | struct device_node *node = dev->dev.of_node; |
16 | const u32 *reg; | 16 | const u32 *reg; |
17 | u64 addr; | 17 | u64 addr; |
18 | int magic; | 18 | int magic; |
@@ -76,17 +76,17 @@ int of_device_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
76 | 76 | ||
77 | ofdev = to_of_device(dev); | 77 | ofdev = to_of_device(dev); |
78 | 78 | ||
79 | if (add_uevent_var(env, "OF_NAME=%s", ofdev->node->name)) | 79 | if (add_uevent_var(env, "OF_NAME=%s", ofdev->dev.of_node->name)) |
80 | return -ENOMEM; | 80 | return -ENOMEM; |
81 | 81 | ||
82 | if (add_uevent_var(env, "OF_TYPE=%s", ofdev->node->type)) | 82 | if (add_uevent_var(env, "OF_TYPE=%s", ofdev->dev.of_node->type)) |
83 | return -ENOMEM; | 83 | return -ENOMEM; |
84 | 84 | ||
85 | /* Since the compatible field can contain pretty much anything | 85 | /* Since the compatible field can contain pretty much anything |
86 | * it's not really legal to split it out with commas. We split it | 86 | * it's not really legal to split it out with commas. We split it |
87 | * up using a number of environment variables instead. */ | 87 | * up using a number of environment variables instead. */ |
88 | 88 | ||
89 | compat = of_get_property(ofdev->node, "compatible", &cplen); | 89 | compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen); |
90 | while (compat && *compat && cplen > 0) { | 90 | while (compat && *compat && cplen > 0) { |
91 | if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat)) | 91 | if (add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat)) |
92 | return -ENOMEM; | 92 | return -ENOMEM; |