diff options
Diffstat (limited to 'arch/powerpc/kernel/rtas.c')
-rw-r--r-- | arch/powerpc/kernel/rtas.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index 9d0735a54564..702fecc93204 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c | |||
@@ -193,16 +193,16 @@ void rtas_progress(char *s, unsigned short hex) | |||
193 | if (display_width == 0) { | 193 | if (display_width == 0) { |
194 | display_width = 0x10; | 194 | display_width = 0x10; |
195 | if ((root = find_path_device("/rtas"))) { | 195 | if ((root = find_path_device("/rtas"))) { |
196 | if ((p = get_property(root, | 196 | if ((p = of_get_property(root, |
197 | "ibm,display-line-length", NULL))) | 197 | "ibm,display-line-length", NULL))) |
198 | display_width = *p; | 198 | display_width = *p; |
199 | if ((p = get_property(root, | 199 | if ((p = of_get_property(root, |
200 | "ibm,form-feed", NULL))) | 200 | "ibm,form-feed", NULL))) |
201 | form_feed = *p; | 201 | form_feed = *p; |
202 | if ((p = get_property(root, | 202 | if ((p = of_get_property(root, |
203 | "ibm,display-number-of-lines", NULL))) | 203 | "ibm,display-number-of-lines", NULL))) |
204 | display_lines = *p; | 204 | display_lines = *p; |
205 | row_width = get_property(root, | 205 | row_width = of_get_property(root, |
206 | "ibm,display-truncation-length", NULL); | 206 | "ibm,display-truncation-length", NULL); |
207 | } | 207 | } |
208 | display_character = rtas_token("display-character"); | 208 | display_character = rtas_token("display-character"); |
@@ -298,7 +298,7 @@ int rtas_token(const char *service) | |||
298 | const int *tokp; | 298 | const int *tokp; |
299 | if (rtas.dev == NULL) | 299 | if (rtas.dev == NULL) |
300 | return RTAS_UNKNOWN_SERVICE; | 300 | return RTAS_UNKNOWN_SERVICE; |
301 | tokp = get_property(rtas.dev, service, NULL); | 301 | tokp = of_get_property(rtas.dev, service, NULL); |
302 | return tokp ? *tokp : RTAS_UNKNOWN_SERVICE; | 302 | return tokp ? *tokp : RTAS_UNKNOWN_SERVICE; |
303 | } | 303 | } |
304 | EXPORT_SYMBOL(rtas_token); | 304 | EXPORT_SYMBOL(rtas_token); |
@@ -832,12 +832,12 @@ void __init rtas_initialize(void) | |||
832 | if (rtas.dev) { | 832 | if (rtas.dev) { |
833 | const u32 *basep, *entryp, *sizep; | 833 | const u32 *basep, *entryp, *sizep; |
834 | 834 | ||
835 | basep = get_property(rtas.dev, "linux,rtas-base", NULL); | 835 | basep = of_get_property(rtas.dev, "linux,rtas-base", NULL); |
836 | sizep = get_property(rtas.dev, "rtas-size", NULL); | 836 | sizep = of_get_property(rtas.dev, "rtas-size", NULL); |
837 | if (basep != NULL && sizep != NULL) { | 837 | if (basep != NULL && sizep != NULL) { |
838 | rtas.base = *basep; | 838 | rtas.base = *basep; |
839 | rtas.size = *sizep; | 839 | rtas.size = *sizep; |
840 | entryp = get_property(rtas.dev, | 840 | entryp = of_get_property(rtas.dev, |
841 | "linux,rtas-entry", NULL); | 841 | "linux,rtas-entry", NULL); |
842 | if (entryp == NULL) /* Ugh */ | 842 | if (entryp == NULL) /* Ugh */ |
843 | rtas.entry = rtas.base; | 843 | rtas.entry = rtas.base; |