Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Rob Herring and committed by
David S. Miller
91abe6b2 726799a4

+8 -8
+2 -2
drivers/sbus/char/bbc_envctrl.c
··· 571 571 int devidx = 0; 572 572 573 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 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 577 attach_one_fan(bp, op, fan_index++); 578 578 } 579 579 if (temp_index != 0 && fan_index != 0) {
+3 -3
drivers/sbus/char/envctrl.c
··· 906 906 int len; 907 907 908 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 910 for (len = 0; len < PCF8584_MAX_CHANNELS; ++len) { 911 911 pchild->mon_type[len] = ENVCTRL_NOMON; 912 912 } ··· 1037 1037 index = 0; 1038 1038 dp = op->dev.of_node->child; 1039 1039 while (dp) { 1040 - if (!strcmp(dp->name, "gpio")) { 1040 + if (of_node_name_eq(dp, "gpio")) { 1041 1041 i2c_childlist[index].i2ctype = I2C_GPIO; 1042 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 1044 i2c_childlist[index].i2ctype = I2C_ADC; 1045 1045 envctrl_init_i2c_child(dp, &(i2c_childlist[index++])); 1046 1046 }
+3 -3
drivers/sbus/char/flash.c
··· 165 165 166 166 parent = dp->parent; 167 167 168 - if (strcmp(parent->name, "sbus") && 169 - strcmp(parent->name, "sbi") && 170 - strcmp(parent->name, "ebus")) 168 + if (!of_node_name_eq(parent, "sbus") && 169 + !of_node_name_eq(parent, "sbi") && 170 + !of_node_name_eq(parent, "ebus")) 171 171 return -ENODEV; 172 172 173 173 flash.read_base = op->resource[0].start;