diff options
| author | Rob Herring | 2018-12-05 20:50:38 +0100 |
|---|---|---|
| committer | David S. Miller | 2018-12-06 06:00:02 +0100 |
| commit | 91abe6b2237f4ff92aec250c7e79765376f17b0b (patch) | |
| tree | 42be9dc7ab50a09659cc6dc2cef8d5505bf70cc7 /drivers/sbus/char/envctrl.c | |
| parent | Merge branch 'sparc-syscall-gen' (diff) | |
| download | kernel-qcow2-linux-91abe6b2237f4ff92aec250c7e79765376f17b0b.tar.gz kernel-qcow2-linux-91abe6b2237f4ff92aec250c7e79765376f17b0b.tar.xz kernel-qcow2-linux-91abe6b2237f4ff92aec250c7e79765376f17b0b.zip | |
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>
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 6 |
1 files changed, 3 insertions, 3 deletions
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, 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++])); } |