aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ibmvscsi
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/scsi/ibmvscsi
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/scsi/ibmvscsi')
-rw-r--r--drivers/scsi/ibmvscsi/ibmvstgt.c8
-rw-r--r--drivers/scsi/ibmvscsi/rpa_vscsi.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index 140dd9700ff6..a39a478bb39a 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -903,16 +903,16 @@ static int get_system_info(void)
903 if (!rootdn) 903 if (!rootdn)
904 return -ENOENT; 904 return -ENOENT;
905 905
906 model = of_get_property(rootdn, "model", NULL); 906 model = get_property(rootdn, "model", NULL);
907 id = of_get_property(rootdn, "system-id", NULL); 907 id = get_property(rootdn, "system-id", NULL);
908 if (model && id) 908 if (model && id)
909 snprintf(system_id, sizeof(system_id), "%s-%s", model, id); 909 snprintf(system_id, sizeof(system_id), "%s-%s", model, id);
910 910
911 name = of_get_property(rootdn, "ibm,partition-name", NULL); 911 name = get_property(rootdn, "ibm,partition-name", NULL);
912 if (name) 912 if (name)
913 strncpy(partition_name, name, sizeof(partition_name)); 913 strncpy(partition_name, name, sizeof(partition_name));
914 914
915 num = of_get_property(rootdn, "ibm,partition-no", NULL); 915 num = get_property(rootdn, "ibm,partition-no", NULL);
916 if (num) 916 if (num)
917 partition_number = *num; 917 partition_number = *num;
918 918
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c
index d8700aaa6114..0a533f398f52 100644
--- a/drivers/scsi/ibmvscsi/rpa_vscsi.c
+++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c
@@ -162,11 +162,11 @@ static void gather_partition_info(void)
162 return; 162 return;
163 } 163 }
164 164
165 ppartition_name = of_get_property(rootdn, "ibm,partition-name", NULL); 165 ppartition_name = get_property(rootdn, "ibm,partition-name", NULL);
166 if (ppartition_name) 166 if (ppartition_name)
167 strncpy(partition_name, ppartition_name, 167 strncpy(partition_name, ppartition_name,
168 sizeof(partition_name)); 168 sizeof(partition_name));
169 p_number_ptr = of_get_property(rootdn, "ibm,partition-no", NULL); 169 p_number_ptr = get_property(rootdn, "ibm,partition-no", NULL);
170 if (p_number_ptr) 170 if (p_number_ptr)
171 partition_number = *p_number_ptr; 171 partition_number = *p_number_ptr;
172 of_node_put(rootdn); 172 of_node_put(rootdn);