aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/sysdev/uic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/sysdev/uic.c')
-rw-r--r--arch/powerpc/sysdev/uic.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/uic.c b/arch/powerpc/sysdev/uic.c
index cdbe68437afe..968fb40af9dc 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;