regulator: Convert to using %pOFn instead of device_node.name

In preparation to remove the node name pointer from struct device_node,
convert printf users to use the %pOFn format specifier.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/regulator/max8997-regulator.c b/drivers/regulator/max8997-regulator.c
index ad0c806b07376e55307664542a899d329eb78df9..3bf5ddfaaea89d0cbebc5e70588759a8aa5b7d1a 100644 (file)
--- a/drivers/regulator/max8997-regulator.c
+++ b/drivers/regulator/max8997-regulator.c
@@ -929,8 +929,8 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
                                break;
 
                if (i == ARRAY_SIZE(regulators)) {
-                       dev_warn(&pdev->dev, "don't know how to configure regulator %s\n",
-                                reg_np->name);
+                       dev_warn(&pdev->dev, "don't know how to configure regulator %pOFn\n",
+                                reg_np);
                        continue;
                }
 

diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index da4fb98247578546f2babe0f790d47ac71656237..65eb1e0350cfd3dc3f6df6d167bcf5e70a52fa2c 100644 (file)
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -203,7 +203,7 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
 
                if (!found)
                        dev_warn(&pdev->dev,
-                                "Unknown regulator: %s\n", child->name);
+                                "Unknown regulator: %pOFn\n", child);
        }
        of_node_put(parent);
 

diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c
index 638f17d4c8485e11fa7d0a9486fc3ec131a341cd..92a516b959a78fe978813f8f8cbe525c702345bf 100644 (file)
--- a/drivers/regulator/of_regulator.c
+++ b/drivers/regulator/of_regulator.c
@@ -95,8 +95,8 @@ static void of_get_regulation_constraints(struct device_node *np,
        if (!ret)
                constraints->settling_time_up = pval;
        if (constraints->settling_time_up && constraints->settling_time) {
-               pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-up-us'\n",
-                       np->name);
+               pr_warn("%pOFn: ambiguous configuration for settling time, ignoring 'regulator-settling-time-up-us'\n",
+                       np);
                constraints->settling_time_up = 0;
        }
 
@@ -105,8 +105,8 @@ static void of_get_regulation_constraints(struct device_node *np,
        if (!ret)
                constraints->settling_time_down = pval;
        if (constraints->settling_time_down && constraints->settling_time) {
-               pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-down-us'\n",
-                       np->name);
+               pr_warn("%pOFn: ambiguous configuration for settling time, ignoring 'regulator-settling-time-down-us'\n",
+                       np);
                constraints->settling_time_down = 0;
        }
 
@@ -127,12 +127,12 @@ static void of_get_regulation_constraints(struct device_node *np,
                if (desc && desc->of_map_mode) {
                        mode = desc->of_map_mode(pval);
                        if (mode == REGULATOR_MODE_INVALID)
-                               pr_err("%s: invalid mode %u\n", np->name, pval);
+                               pr_err("%pOFn: invalid mode %u\n", np, pval);
                        else
                                constraints->initial_mode = mode;
                } else {
-                       pr_warn("%s: mapping for mode %d not defined\n",
-                               np->name, pval);
+                       pr_warn("%pOFn: mapping for mode %d not defined\n",
+                               np, pval);
                }
        }
 
@@ -144,14 +144,14 @@ static void of_get_regulation_constraints(struct device_node *np,
                                ret = of_property_read_u32_index(np,
                                        "regulator-allowed-modes", i, &pval);
                                if (ret) {
-                                       pr_err("%s: couldn't read allowed modes index %d, ret=%d\n",
-                                               np->name, i, ret);
+                                       pr_err("%pOFn: couldn't read allowed modes index %d, ret=%d\n",
+                                               np, i, ret);
                                        break;
                                }
                                mode = desc->of_map_mode(pval);
                                if (mode == REGULATOR_MODE_INVALID)
-                                       pr_err("%s: invalid regulator-allowed-modes element %u\n",
-                                               np->name, pval);
+                                       pr_err("%pOFn: invalid regulator-allowed-modes element %u\n",
+                                               np, pval);
                                else
                                        constraints->valid_modes_mask |= mode;
                        }
@@ -159,7 +159,7 @@ static void of_get_regulation_constraints(struct device_node *np,
                                constraints->valid_ops_mask
                                        |= REGULATOR_CHANGE_MODE;
                } else {
-                       pr_warn("%s: mode mapping not defined\n", np->name);
+                       pr_warn("%pOFn: mode mapping not defined\n", np);
                }
        }
 
@@ -197,13 +197,13 @@ static void of_get_regulation_constraints(struct device_node *np,
                        if (desc && desc->of_map_mode) {
                                mode = desc->of_map_mode(pval);
                                if (mode == REGULATOR_MODE_INVALID)
-                                       pr_err("%s: invalid mode %u\n",
-                                              np->name, pval);
+                                       pr_err("%pOFn: invalid mode %u\n",
+                                              np, pval);
                                else
                                        suspend_state->mode = mode;
                        } else {
-                               pr_warn("%s: mapping for mode %d not defined\n",
-                                       np->name, pval);
+                               pr_warn("%pOFn: mapping for mode %d not defined\n",
+                                       np, pval);
                        }
                }
 
@@ -351,8 +351,8 @@ int of_regulator_match(struct device *dev, struct device_node *node,
                                                           match->desc);
                        if (!match->init_data) {
                                dev_err(dev,
-                                       "failed to parse DT for regulator %s\n",
-                                       child->name);
+                                       "failed to parse DT for regulator %pOFn\n",
+                                       child);
                                of_node_put(child);
                                return -EINVAL;
                        }
@@ -401,16 +401,16 @@ struct regulator_init_data *regulator_of_get_init_data(struct device *dev,
                init_data = of_get_regulator_init_data(dev, child, desc);
                if (!init_data) {
                        dev_err(dev,
-                               "failed to parse DT for regulator %s\n",
-                               child->name);
+                               "failed to parse DT for regulator %pOFn\n",
+                               child);
                        break;
                }
 
                if (desc->of_parse_cb) {
                        if (desc->of_parse_cb(child, desc, config)) {
                                dev_err(dev,
-                                       "driver callback failed to parse DT for regulator %s\n",
-                                       child->name);
+                                       "driver callback failed to parse DT for regulator %pOFn\n",
+                                       child);
                                init_data = NULL;
                                break;
                        }

diff --git a/drivers/regulator/qcom-rpmh-regulator.c b/drivers/regulator/qcom-rpmh-regulator.c
index 9f27daebd8c8adbfbbef158c7c633672a6f7c888..301e7f6953742bf718129b092ec6c9ae23fdedfd 100644 (file)
--- a/drivers/regulator/qcom-rpmh-regulator.c
+++ b/drivers/regulator/qcom-rpmh-regulator.c
@@ -414,7 +414,7 @@ static int rpmh_regulator_init_vreg(struct rpmh_vreg *vreg, struct device *dev,
                        break;
 
        if (!rpmh_data->name) {
-               dev_err(dev, "Unknown regulator %s\n", node->name);
+               dev_err(dev, "Unknown regulator %pOFn\n", node);
                return -EINVAL;
        }
 
@@ -423,8 +423,8 @@ static int rpmh_regulator_init_vreg(struct rpmh_vreg *vreg, struct device *dev,
 
        vreg->addr = cmd_db_read_addr(rpmh_resource_name);
        if (!vreg->addr) {
-               dev_err(dev, "%s: could not find RPMh address for resource %s\n",
-                       node->name, rpmh_resource_name);
+               dev_err(dev, "%pOFn: could not find RPMh address for resource %s\n",
+                       node, rpmh_resource_name);
                return -ENODEV;
        }
 
@@ -469,13 +469,13 @@ static int rpmh_regulator_init_vreg(struct rpmh_vreg *vreg, struct device *dev,
        rdev = devm_regulator_register(dev, &vreg->rdesc, &reg_config);
        if (IS_ERR(rdev)) {
                ret = PTR_ERR(rdev);
-               dev_err(dev, "%s: devm_regulator_register() failed, ret=%d\n",
-                       node->name, ret);
+               dev_err(dev, "%pOFn: devm_regulator_register() failed, ret=%d\n",
+                       node, ret);
                return ret;
        }
 
-       dev_dbg(dev, "%s regulator registered for RPMh resource %s @ 0x%05X\n",
-               node->name, rpmh_resource_name, vreg->addr);
+       dev_dbg(dev, "%pOFn regulator registered for RPMh resource %s @ 0x%05X\n",
+               node, rpmh_resource_name, vreg->addr);
 
        return 0;
 }

diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c
index 667d16dc83ce1506737ddc6c10fa072d31d558d9..09a97a7093e848dbc82f56af41995f32f4dcd581 100644 (file)
--- a/drivers/regulator/s5m8767.c
+++ b/drivers/regulator/s5m8767.c
@@ -447,15 +447,15 @@ static void s5m8767_regulator_config_ext_control(struct s5m8767_info *s5m8767,
        }
        if (mode != S5M8767_ENCTRL_USE_GPIO) {
                dev_warn(s5m8767->dev,
-                               "ext-control for %s: mismatched op_mode (%x), ignoring\n",
-                               rdata->reg_node->name, mode);
+                               "ext-control for %pOFn: mismatched op_mode (%x), ignoring\n",
+                               rdata->reg_node, mode);
                return;
        }
 
        if (!rdata->ext_control_gpiod) {
                dev_warn(s5m8767->dev,
-                               "ext-control for %s: GPIO not valid, ignoring\n",
-                        rdata->reg_node->name);
+                               "ext-control for %pOFn: GPIO not valid, ignoring\n",
+                        rdata->reg_node);
                return;
        }
 
@@ -566,8 +566,8 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev,
 
                if (i == ARRAY_SIZE(regulators)) {
                        dev_warn(iodev->dev,
-                       "don't know how to configure regulator %s\n",
-                       reg_np->name);
+                       "don't know how to configure regulator %pOFn\n",
+                       reg_np);
                        continue;
                }