sbus: Use of_node_name_eq for node name comparisons
PATCH 1/1 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" <[email protected]>
Signed-off-by Rob Herring <[email protected]>
--- drivers/sbus/char/bbc_envctrl.c | 4 ++-- drivers/sbus/char/envctrl.c | 6 +++--- drivers/sbus/char/flash.c | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-)
drivers/sbus/char/bbc_envctrl.c +2 -2
@@ -571,9 +571,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)int devidx =0 ;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++); -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++); }if (temp_index !=0 && fan_index !=0 ) {
drivers/sbus/char/envctrl.c +3 -3
@@ -906,7 +906,7 @@ static void envctrl_init_i2c_child(struct device_node *dp,int len; 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) { pchild->mon_type[len] =ENVCTRL_NOMON ; }
@@ -1037,10 +1037,10 @@ static int envctrl_probe(struct platform_device *op) index =0 ; dp = op->dev.of_node->child;while (dp) { -if (!strcmp (dp->name,"gpio" )) { +if (of_node_name_eq (dp,"gpio" )) { i2c_childlist[index].i2ctype =I2C_GPIO ;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 ;envctrl_init_i2c_child (dp, &(i2c_childlist[index++])); }
drivers/sbus/char/flash.c +3 -3
@@ -165,9 +165,9 @@ static int flash_probe(struct platform_device *op) parent = dp->parent; -if (strcmp (parent->name,"sbus" ) && -strcmp (parent->name,"sbi" ) && -strcmp (parent->name,"ebus" )) +if (!of_node_name_eq (parent,"sbus" ) && + !of_node_name_eq (parent,"sbi" ) && + !of_node_name_eq (parent,"ebus" ))return -ENODEV ; flash.read_base = op->resource[0 ].start;
Signature · 1 line
2.19.1