diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-03 08:26:41 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:55:19 -0400 |
commit | e2eb63927bfcb54232163bfec32440246fd44457 (patch) | |
tree | 596656edeb2332b5134d8236fa50b87f2c0ece29 /arch/powerpc/kernel/btext.c | |
parent | ceef87782a9452eeeca774e65d7f4e06455780a3 (diff) |
[POWERPC] Rename get_property to of_get_property: arch/powerpc
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/btext.c')
-rw-r--r-- | arch/powerpc/kernel/btext.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c index 3678997339d6..e7b684689e04 100644 --- a/arch/powerpc/kernel/btext.c +++ b/arch/powerpc/kernel/btext.c | |||
@@ -161,33 +161,33 @@ int btext_initialize(struct device_node *np) | |||
161 | unsigned long address = 0; | 161 | unsigned long address = 0; |
162 | const u32 *prop; | 162 | const u32 *prop; |
163 | 163 | ||
164 | prop = get_property(np, "linux,bootx-width", NULL); | 164 | prop = of_get_property(np, "linux,bootx-width", NULL); |
165 | if (prop == NULL) | 165 | if (prop == NULL) |
166 | prop = get_property(np, "width", NULL); | 166 | prop = of_get_property(np, "width", NULL); |
167 | if (prop == NULL) | 167 | if (prop == NULL) |
168 | return -EINVAL; | 168 | return -EINVAL; |
169 | width = *prop; | 169 | width = *prop; |
170 | prop = get_property(np, "linux,bootx-height", NULL); | 170 | prop = of_get_property(np, "linux,bootx-height", NULL); |
171 | if (prop == NULL) | 171 | if (prop == NULL) |
172 | prop = get_property(np, "height", NULL); | 172 | prop = of_get_property(np, "height", NULL); |
173 | if (prop == NULL) | 173 | if (prop == NULL) |
174 | return -EINVAL; | 174 | return -EINVAL; |
175 | height = *prop; | 175 | height = *prop; |
176 | prop = get_property(np, "linux,bootx-depth", NULL); | 176 | prop = of_get_property(np, "linux,bootx-depth", NULL); |
177 | if (prop == NULL) | 177 | if (prop == NULL) |
178 | prop = get_property(np, "depth", NULL); | 178 | prop = of_get_property(np, "depth", NULL); |
179 | if (prop == NULL) | 179 | if (prop == NULL) |
180 | return -EINVAL; | 180 | return -EINVAL; |
181 | depth = *prop; | 181 | depth = *prop; |
182 | pitch = width * ((depth + 7) / 8); | 182 | pitch = width * ((depth + 7) / 8); |
183 | prop = get_property(np, "linux,bootx-linebytes", NULL); | 183 | prop = of_get_property(np, "linux,bootx-linebytes", NULL); |
184 | if (prop == NULL) | 184 | if (prop == NULL) |
185 | prop = get_property(np, "linebytes", NULL); | 185 | prop = of_get_property(np, "linebytes", NULL); |
186 | if (prop && *prop != 0xffffffffu) | 186 | if (prop && *prop != 0xffffffffu) |
187 | pitch = *prop; | 187 | pitch = *prop; |
188 | if (pitch == 1) | 188 | if (pitch == 1) |
189 | pitch = 0x1000; | 189 | pitch = 0x1000; |
190 | prop = get_property(np, "address", NULL); | 190 | prop = of_get_property(np, "address", NULL); |
191 | if (prop) | 191 | if (prop) |
192 | address = *prop; | 192 | address = *prop; |
193 | 193 | ||
@@ -219,7 +219,7 @@ int __init btext_find_display(int allow_nonstdout) | |||
219 | struct device_node *np = NULL; | 219 | struct device_node *np = NULL; |
220 | int rc = -ENODEV; | 220 | int rc = -ENODEV; |
221 | 221 | ||
222 | name = get_property(of_chosen, "linux,stdout-path", NULL); | 222 | name = of_get_property(of_chosen, "linux,stdout-path", NULL); |
223 | if (name != NULL) { | 223 | if (name != NULL) { |
224 | np = of_find_node_by_path(name); | 224 | np = of_find_node_by_path(name); |
225 | if (np != NULL) { | 225 | if (np != NULL) { |
@@ -236,7 +236,7 @@ int __init btext_find_display(int allow_nonstdout) | |||
236 | return rc; | 236 | return rc; |
237 | 237 | ||
238 | for (np = NULL; (np = of_find_node_by_type(np, "display"));) { | 238 | for (np = NULL; (np = of_find_node_by_type(np, "display"));) { |
239 | if (get_property(np, "linux,opened", NULL)) { | 239 | if (of_get_property(np, "linux,opened", NULL)) { |
240 | printk("trying %s ...\n", np->full_name); | 240 | printk("trying %s ...\n", np->full_name); |
241 | rc = btext_initialize(np); | 241 | rc = btext_initialize(np); |
242 | printk("result: %d\n", rc); | 242 | printk("result: %d\n", rc); |