openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Herring 2018-12-05 13:50:38 -06:00 committed by David S. Miller
parent 726799a4f9
commit 91abe6b223
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/sbus/char/bbc_envctrl.c
View File

@ -571,9 +571,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
int devidx = 0; int devidx = 0;
while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) { while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {
if (!strcmp(op->dev.of_node->name, "temperature")) if (of_node_name_eq(op->dev.of_node, "temperature"))
attach_one_temp(bp, op, temp_index++); attach_one_temp(bp, op, temp_index++);
if (!strcmp(op->dev.of_node->name, "fan-control")) if (of_node_name_eq(op->dev.of_node, "fan-control"))
attach_one_fan(bp, op, fan_index++); attach_one_fan(bp, op, fan_index++);
} }
if (temp_index != 0 && fan_index != 0) { if (temp_index != 0 && fan_index != 0) {

6
drivers/sbus/char/envctrl.c
View File

@ -906,7 +906,7 @@ static void envctrl_init_i2c_child(struct device_node *dp,
int len; int len;
root_node = of_find_node_by_path("/"); root_node = of_find_node_by_path("/");
if (!strcmp(root_node->name, "SUNW,UltraSPARC-IIi-cEngine")) { if (of_node_name_eq(root_node, "SUNW,UltraSPARC-IIi-cEngine")) {
for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) { for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) {
pchild->mon_type[len] = ENVCTRL_NOMON; pchild->mon_type[len] = ENVCTRL_NOMON;
} }
@ -1037,10 +1037,10 @@ static int envctrl_probe(struct platform_device *op)
index = 0; index = 0;
dp = op->dev.of_node->child; dp = op->dev.of_node->child;
while (dp) { while (dp) {
if (!strcmp(dp->name, "gpio")) { if (of_node_name_eq(dp, "gpio")) {
i2c_childlist[index].i2ctype = I2C_GPIO; i2c_childlist[index].i2ctype = I2C_GPIO;
envctrl_init_i2c_child(dp, &(i2c_childlist[index++])); envctrl_init_i2c_child(dp, &(i2c_childlist[index++]));
} else if (!strcmp(dp->name, "adc")) { } else if (of_node_name_eq(dp, "adc")) {
i2c_childlist[index].i2ctype = I2C_ADC; i2c_childlist[index].i2ctype = I2C_ADC;
envctrl_init_i2c_child(dp, &(i2c_childlist[index++])); envctrl_init_i2c_child(dp, &(i2c_childlist[index++]));
} }

6
drivers/sbus/char/flash.c
View File

@ -165,9 +165,9 @@ static int flash_probe(struct platform_device *op)
parent = dp->parent; parent = dp->parent;
if (strcmp(parent->name, "sbus") && if (!of_node_name_eq(parent, "sbus") &&
strcmp(parent->name, "sbi") && !of_node_name_eq(parent, "sbi") &&
strcmp(parent->name, "ebus")) !of_node_name_eq(parent, "ebus"))
return -ENODEV; return -ENODEV;
flash.read_base = op->resource[0].start; flash.read_base = op->resource[0].start;