summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-12-05 14:50:38 -0500
committerDavid S. Miller <davem@davemloft.net>2018-12-06 00:00:02 -0500
commit91abe6b2237f4ff92aec250c7e79765376f17b0b (patch)
tree42be9dc7ab50a09659cc6dc2cef8d5505bf70cc7
parent726799a4f9192800a6393b92da8d7573d573eb8e (diff)
sbus: Use of_node_name_eq for node name comparisons
Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer. Cc: "David S. Miller" <davem@davemloft.net> Cc: sparclinux@vger.kernel.org Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/sbus/char/bbc_envctrl.c4
-rw-r--r--drivers/sbus/char/envctrl.c6
-rw-r--r--drivers/sbus/char/flash.c6
3 files changed, 8 insertions, 8 deletions
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index fb5bcf6dddc1..4f2dd21e44a0 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -571,9 +571,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
571 int devidx = 0; 571 int devidx = 0;
572 572
573 while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) { 573 while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {
574 if (!strcmp(op->dev.of_node->name, "temperature")) 574 if (of_node_name_eq(op->dev.of_node, "temperature"))
575 attach_one_temp(bp, op, temp_index++); 575 attach_one_temp(bp, op, temp_index++);
576 if (!strcmp(op->dev.of_node->name, "fan-control")) 576 if (of_node_name_eq(op->dev.of_node, "fan-control"))
577 attach_one_fan(bp, op, fan_index++); 577 attach_one_fan(bp, op, fan_index++);
578 } 578 }
579 if (temp_index != 0 && fan_index != 0) { 579 if (temp_index != 0 && fan_index != 0) {
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index 56e962a01493..08b7d25c1136 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -906,7 +906,7 @@ static void envctrl_init_i2c_child(struct device_node *dp,
906 int len; 906 int len;
907 907
908 root_node = of_find_node_by_path("/"); 908 root_node = of_find_node_by_path("/");
909 if (!strcmp(root_node->name, "SUNW,UltraSPARC-IIi-cEngine")) { 909 if (of_node_name_eq(root_node, "SUNW,UltraSPARC-IIi-cEngine")) {
910 for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) { 910 for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) {
911 pchild->mon_type[len] = ENVCTRL_NOMON; 911 pchild->mon_type[len] = ENVCTRL_NOMON;
912 } 912 }
@@ -1037,10 +1037,10 @@ static int envctrl_probe(struct platform_device *op)
1037 index = 0; 1037 index = 0;
1038 dp = op->dev.of_node->child; 1038 dp = op->dev.of_node->child;
1039 while (dp) { 1039 while (dp) {
1040 if (!strcmp(dp->name, "gpio")) { 1040 if (of_node_name_eq(dp, "gpio")) {
1041 i2c_childlist[index].i2ctype = I2C_GPIO; 1041 i2c_childlist[index].i2ctype = I2C_GPIO;
1042 envctrl_init_i2c_child(dp, &(i2c_childlist[index++])); 1042 envctrl_init_i2c_child(dp, &(i2c_childlist[index++]));
1043 } else if (!strcmp(dp->name, "adc")) { 1043 } else if (of_node_name_eq(dp, "adc")) {
1044 i2c_childlist[index].i2ctype = I2C_ADC; 1044 i2c_childlist[index].i2ctype = I2C_ADC;
1045 envctrl_init_i2c_child(dp, &(i2c_childlist[index++])); 1045 envctrl_init_i2c_child(dp, &(i2c_childlist[index++]));
1046 } 1046 }
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index a610b8d3d11f..515dc1ff1e33 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -165,9 +165,9 @@ static int flash_probe(struct platform_device *op)
165 165
166 parent = dp->parent; 166 parent = dp->parent;
167 167
168 if (strcmp(parent->name, "sbus") && 168 if (!of_node_name_eq(parent, "sbus") &&
169 strcmp(parent->name, "sbi") && 169 !of_node_name_eq(parent, "sbi") &&
170 strcmp(parent->name, "ebus")) 170 !of_node_name_eq(parent, "ebus"))
171 return -ENODEV; 171 return -ENODEV;
172 172
173 flash.read_base = op->resource[0].start; 173 flash.read_base = op->resource[0].start;