diff options
Diffstat (limited to 'drivers/macintosh/smu.c')
| -rw-r--r-- | drivers/macintosh/smu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index c9f3dc4fd3ee..a98a328b1cfc 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 = get_property(smu->db_node, "reg", NULL); | 494 | data = of_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 = get_property(smu->msg_node, "reg", NULL); | 515 | data = of_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; |
| @@ -952,7 +952,7 @@ static struct smu_sdbp_header *smu_create_sdb_partition(int id) | |||
| 952 | prop->name = ((char *)prop) + tlen - 18; | 952 | prop->name = ((char *)prop) + tlen - 18; |
| 953 | sprintf(prop->name, "sdb-partition-%02x", id); | 953 | sprintf(prop->name, "sdb-partition-%02x", id); |
| 954 | prop->length = len; | 954 | prop->length = len; |
| 955 | prop->value = (unsigned char *)hdr; | 955 | prop->value = hdr; |
| 956 | prop->next = NULL; | 956 | prop->next = NULL; |
| 957 | 957 | ||
| 958 | /* Read the datablock */ | 958 | /* Read the datablock */ |
| @@ -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 = get_property(smu->of_node, pname, size); | 1007 | part = of_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); |
