diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-04-29 02:29:08 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 21:02:05 -0400 |
commit | 12d371a69e6df96cd949af6bcb569e978e8f9d41 (patch) | |
tree | 30ed043c2d262b1bf25cbc0a1e19111dc7ac407e /arch/powerpc/sysdev | |
parent | 8d1cea6e1439a113b1f17eab9b4e2f0cfc24bbb0 (diff) |
[POWERPC] get_property cleanups
Just another pass through arch/powerpc for old usages.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/sysdev')
-rw-r--r-- | arch/powerpc/sysdev/uic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c index cdbe68437af..968fb40af9d 100644 --- a/arch/powerpc/sysdev/uic.c +++ b/arch/powerpc/sysdev/uic.c | |||
@@ -230,7 +230,7 @@ static struct uic * __init uic_init_one(struct device_node *node) | |||
230 | memset(uic, 0, sizeof(*uic)); | 230 | memset(uic, 0, sizeof(*uic)); |
231 | spin_lock_init(&uic->lock); | 231 | spin_lock_init(&uic->lock); |
232 | uic->of_node = of_node_get(node); | 232 | uic->of_node = of_node_get(node); |
233 | indexp = get_property(node, "cell-index", &len); | 233 | indexp = of_get_property(node, "cell-index", &len); |
234 | if (!indexp || (len != sizeof(u32))) { | 234 | if (!indexp || (len != sizeof(u32))) { |
235 | printk(KERN_ERR "uic: Device node %s has missing or invalid " | 235 | printk(KERN_ERR "uic: Device node %s has missing or invalid " |
236 | "cell-index property\n", node->full_name); | 236 | "cell-index property\n", node->full_name); |
@@ -238,7 +238,7 @@ static struct uic * __init uic_init_one(struct device_node *node) | |||
238 | } | 238 | } |
239 | uic->index = *indexp; | 239 | uic->index = *indexp; |
240 | 240 | ||
241 | dcrreg = get_property(node, "dcr-reg", &len); | 241 | dcrreg = of_get_property(node, "dcr-reg", &len); |
242 | if (!dcrreg || (len != 2*sizeof(u32))) { | 242 | if (!dcrreg || (len != 2*sizeof(u32))) { |
243 | printk(KERN_ERR "uic: Device node %s has missing or invalid " | 243 | printk(KERN_ERR "uic: Device node %s has missing or invalid " |
244 | "dcr-reg property\n", node->full_name); | 244 | "dcr-reg property\n", node->full_name); |
@@ -278,7 +278,7 @@ void __init uic_init_tree(void) | |||
278 | 278 | ||
279 | np = of_find_compatible_node(NULL, NULL, "ibm,uic"); | 279 | np = of_find_compatible_node(NULL, NULL, "ibm,uic"); |
280 | while (np) { | 280 | while (np) { |
281 | interrupts = get_property(np, "interrupts", NULL); | 281 | interrupts = of_get_property(np, "interrupts", NULL); |
282 | if (! interrupts) | 282 | if (! interrupts) |
283 | break; | 283 | break; |
284 | 284 | ||
@@ -297,7 +297,7 @@ void __init uic_init_tree(void) | |||
297 | /* The scan again for cascaded UICs */ | 297 | /* The scan again for cascaded UICs */ |
298 | np = of_find_compatible_node(NULL, NULL, "ibm,uic"); | 298 | np = of_find_compatible_node(NULL, NULL, "ibm,uic"); |
299 | while (np) { | 299 | while (np) { |
300 | interrupts = get_property(np, "interrupts", NULL); | 300 | interrupts = of_get_property(np, "interrupts", NULL); |
301 | if (interrupts) { | 301 | if (interrupts) { |
302 | /* Secondary UIC */ | 302 | /* Secondary UIC */ |
303 | int cascade_virq; | 303 | int cascade_virq; |