return -ENODEV;
        }
        for_each_child_of_node(nproot, np) {
-               if (!of_node_cmp(np->name, info->desc.name)) {
+               if (of_node_name_eq(np, info->desc.name)) {
                        config->init_data =
                                of_get_regulator_init_data(&pdev->dev, np,
                                                           &info->desc);
 
                        return -ENODEV;
 
                for_each_child_of_node(nproot, np) {
-                       if (!of_node_cmp(np->name,
+                       if (of_node_name_eq(np,
                                         regulator->info->reg_desc.name)) {
                                config.init_data = of_get_regulator_init_data(
                                        &pdev->dev, np,
 
        pdata->regulators = rdata;
        for_each_child_of_node(regulators_np, reg_np) {
                for (i = 0; i < ARRAY_SIZE(regulators); i++)
-                       if (!of_node_cmp(reg_np->name, regulators[i].name))
+                       if (of_node_name_eq(reg_np, regulators[i].name))
                                break;
 
                if (i == ARRAY_SIZE(regulators)) {
 
                for (i = 0; i < num_regulators; i++) {
                        if (!regulators[i].desc.name)
                                continue;
-                       if (!of_node_cmp(child->name,
+                       if (of_node_name_eq(child,
                                         regulators[i].desc.name)) {
                                p->id = i;
                                p->init_data = of_get_regulator_init_data(
 
        vreg->dev = dev;
 
        for (rpmh_data = pmic_rpmh_data; rpmh_data->name; rpmh_data++)
-               if (!strcmp(rpmh_data->name, node->name))
+               if (of_node_name_eq(node, rpmh_data->name))
                        break;
 
        if (!rpmh_data->name) {
 
        pdata->opmode = rmode;
        for_each_child_of_node(regulators_np, reg_np) {
                for (i = 0; i < ARRAY_SIZE(regulators); i++)
-                       if (!of_node_cmp(reg_np->name, regulators[i].name))
+                       if (of_node_name_eq(reg_np, regulators[i].name))
                                break;
 
                if (i == ARRAY_SIZE(regulators)) {