diff options
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/ibmvscsi/ibmvstgt.c | 8 | ||||
-rw-r--r-- | drivers/scsi/ibmvscsi/rpa_vscsi.c | 4 | ||||
-rw-r--r-- | drivers/scsi/mac53c94.c | 2 | ||||
-rw-r--r-- | drivers/scsi/mesh.c | 2 |
4 files changed, 8 insertions, 8 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); |
diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c index 5806ede120a4..753d88306cd1 100644 --- a/drivers/scsi/mac53c94.c +++ b/drivers/scsi/mac53c94.c | |||
@@ -471,7 +471,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat | |||
471 | goto out_free; | 471 | goto out_free; |
472 | } | 472 | } |
473 | 473 | ||
474 | clkprop = of_get_property(node, "clock-frequency", &proplen); | 474 | clkprop = get_property(node, "clock-frequency", &proplen); |
475 | if (clkprop == NULL || proplen != sizeof(int)) { | 475 | if (clkprop == NULL || proplen != sizeof(int)) { |
476 | printk(KERN_ERR "%s: can't get clock frequency, " | 476 | printk(KERN_ERR "%s: can't get clock frequency, " |
477 | "assuming 25MHz\n", node->full_name); | 477 | "assuming 25MHz\n", node->full_name); |
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index cf3666d7d97a..1fd3c7590d31 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c | |||
@@ -1947,7 +1947,7 @@ static int mesh_probe(struct macio_dev *mdev, const struct of_device_id *match) | |||
1947 | ms->tgts[tgt].current_req = NULL; | 1947 | ms->tgts[tgt].current_req = NULL; |
1948 | } | 1948 | } |
1949 | 1949 | ||
1950 | if ((cfp = of_get_property(mesh, "clock-frequency", NULL))) | 1950 | if ((cfp = get_property(mesh, "clock-frequency", NULL))) |
1951 | ms->clk_freq = *cfp; | 1951 | ms->clk_freq = *cfp; |
1952 | else { | 1952 | else { |
1953 | printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n"); | 1953 | printk(KERN_INFO "mesh: assuming 50MHz clock frequency\n"); |