diff options
-rw-r--r-- | arch/powerpc/kernel/of_device.c | 4 | ||||
-rw-r--r-- | arch/powerpc/platforms/52xx/efika.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/of_device.c b/arch/powerpc/kernel/of_device.c index e8aa1f3675b7..0c8ea7659d92 100644 --- a/arch/powerpc/kernel/of_device.c +++ b/arch/powerpc/kernel/of_device.c | |||
@@ -132,7 +132,7 @@ static ssize_t of_device_get_modalias(struct of_device *ofdev, | |||
132 | ofdev->node->name, ofdev->node->type); | 132 | ofdev->node->name, ofdev->node->type); |
133 | 133 | ||
134 | /* Get compatible property if any */ | 134 | /* Get compatible property if any */ |
135 | compat = get_property(ofdev->node, "compatible", &cplen); | 135 | compat = of_get_property(ofdev->node, "compatible", &cplen); |
136 | if (!compat) | 136 | if (!compat) |
137 | return csize; | 137 | return csize; |
138 | 138 | ||
@@ -194,7 +194,7 @@ int of_device_uevent(struct device *dev, | |||
194 | * it's not really legal to split it out with commas. We split it | 194 | * it's not really legal to split it out with commas. We split it |
195 | * up using a number of environment variables instead. */ | 195 | * up using a number of environment variables instead. */ |
196 | 196 | ||
197 | compat = get_property(ofdev->node, "compatible", &cplen); | 197 | compat = of_get_property(ofdev->node, "compatible", &cplen); |
198 | while (compat && *compat && cplen > 0) { | 198 | while (compat && *compat && cplen > 0) { |
199 | if (add_uevent_var(envp, num_envp, &i, | 199 | if (add_uevent_var(envp, num_envp, &i, |
200 | buffer, buffer_size, &length, | 200 | buffer, buffer_size, &length, |
diff --git a/arch/powerpc/platforms/52xx/efika.c b/arch/powerpc/platforms/52xx/efika.c index 042008486969..0eceb1fc2670 100644 --- a/arch/powerpc/platforms/52xx/efika.c +++ b/arch/powerpc/platforms/52xx/efika.c | |||
@@ -232,12 +232,12 @@ static void __init efika_init_early(void) | |||
232 | /* find the boot console from /chosen/stdout */ | 232 | /* find the boot console from /chosen/stdout */ |
233 | if (!of_chosen) | 233 | if (!of_chosen) |
234 | return; | 234 | return; |
235 | device_type = get_property(of_chosen, "linux,stdout-path", NULL); | 235 | device_type = of_get_property(of_chosen, "linux,stdout-path", NULL); |
236 | if (!device_type) | 236 | if (!device_type) |
237 | return; | 237 | return; |
238 | stdout_node = of_find_node_by_path(device_type); | 238 | stdout_node = of_find_node_by_path(device_type); |
239 | if (stdout_node) { | 239 | if (stdout_node) { |
240 | device_type = get_property(stdout_node, "device_type", NULL); | 240 | device_type = of_get_property(stdout_node, "device_type", NULL); |
241 | if (device_type && strcmp(device_type, "serial") == 0) | 241 | if (device_type && strcmp(device_type, "serial") == 0) |
242 | add_preferred_console("ttyPSC", 0, NULL); | 242 | add_preferred_console("ttyPSC", 0, NULL); |
243 | of_node_put(stdout_node); | 243 | of_node_put(stdout_node); |