aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh/smu.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2007-04-26 08:24:31 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-26 08:24:31 -0400
commita48141db68e4b9143759435badcc1a49d9022db4 (patch)
treea7d9e5e259c5aa44131e5d1e280f772edb5cdeb5 /drivers/macintosh/smu.c
parent0999ed7f57728c1919b131207e47d9b311cfbd74 (diff)
Revert "[POWERPC] Rename get_property to of_get_property: drivers"
This reverts commit d05c7a80cf39ae7d0f8d0c3e47c93d51fcd393d3, which included changes which should go via other subsystem maintainers.
Diffstat (limited to 'drivers/macintosh/smu.c')
-rw-r--r--drivers/macintosh/smu.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index 135f22eb1ad4..45bb3c1dfeb1 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -491,7 +491,7 @@ int __init smu_init (void)
491 printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n"); 491 printk(KERN_ERR "SMU: Can't find doorbell GPIO !\n");
492 goto fail; 492 goto fail;
493 } 493 }
494 data = of_get_property(smu->db_node, "reg", NULL); 494 data = get_property(smu->db_node, "reg", NULL);
495 if (data == NULL) { 495 if (data == NULL) {
496 of_node_put(smu->db_node); 496 of_node_put(smu->db_node);
497 smu->db_node = NULL; 497 smu->db_node = NULL;
@@ -512,7 +512,7 @@ int __init smu_init (void)
512 smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt"); 512 smu->msg_node = of_find_node_by_name(NULL, "smu-interrupt");
513 if (smu->msg_node == NULL) 513 if (smu->msg_node == NULL)
514 break; 514 break;
515 data = of_get_property(smu->msg_node, "reg", NULL); 515 data = get_property(smu->msg_node, "reg", NULL);
516 if (data == NULL) { 516 if (data == NULL) {
517 of_node_put(smu->msg_node); 517 of_node_put(smu->msg_node);
518 smu->msg_node = NULL; 518 smu->msg_node = NULL;
@@ -1004,7 +1004,7 @@ const struct smu_sdbp_header *__smu_get_sdb_partition(int id,
1004 } else 1004 } else
1005 mutex_lock(&smu_part_access); 1005 mutex_lock(&smu_part_access);
1006 1006
1007 part = of_get_property(smu->of_node, pname, size); 1007 part = get_property(smu->of_node, pname, size);
1008 if (part == NULL) { 1008 if (part == NULL) {
1009 DPRINTK("trying to extract from SMU ...\n"); 1009 DPRINTK("trying to extract from SMU ...\n");
1010 part = smu_create_sdb_partition(id); 1010 part = smu_create_sdb_partition(id);