Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next

[linux.git] / drivers / sbus / char / envctrl.c

diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index b8481927bfe4048b4147e01c77c0f7f695ab90bb..1a6e7224017cd4b74ff2bf66841d2ec4fc7b1e77 100644 (file)
--- 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;
                        }
@@ -1039,10 +1039,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++]));
                }