hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Herring 2018-08-27 20:52:42 -05:00 committed by Mark Brown
parent 5b394b2ddf
commit 0c9721a5d1
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/regulator/max8997-regulator.c
View File

@ -929,8 +929,8 @@ static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
break; break;
if (i == ARRAY_SIZE(regulators)) { if (i == ARRAY_SIZE(regulators)) {
dev_warn(&pdev->dev, "don't know how to configure regulator %s\n", dev_warn(&pdev->dev, "don't know how to configure regulator %pOFn\n",
reg_np->name); reg_np);
continue; continue;
} }

2
drivers/regulator/mc13xxx-regulator-core.c
View File

@ -203,7 +203,7 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
if (!found) if (!found)
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Unknown regulator: %s\n", child->name); "Unknown regulator: %pOFn\n", child);
} }
of_node_put(parent); of_node_put(parent);

44
drivers/regulator/of_regulator.c
View File

@ -95,8 +95,8 @@ static void of_get_regulation_constraints(struct device_node *np,
if (!ret) if (!ret)
constraints->settling_time_up = pval; constraints->settling_time_up = pval;
if (constraints->settling_time_up && constraints->settling_time) { if (constraints->settling_time_up && constraints->settling_time) {
pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-up-us'\n", pr_warn("%pOFn: ambiguous configuration for settling time, ignoring 'regulator-settling-time-up-us'\n",
np->name); np);
constraints->settling_time_up = 0; constraints->settling_time_up = 0;
} }
@ -105,8 +105,8 @@ static void of_get_regulation_constraints(struct device_node *np,
if (!ret) if (!ret)
constraints->settling_time_down = pval; constraints->settling_time_down = pval;
if (constraints->settling_time_down && constraints->settling_time) { if (constraints->settling_time_down && constraints->settling_time) {
pr_warn("%s: ambiguous configuration for settling time, ignoring 'regulator-settling-time-down-us'\n", pr_warn("%pOFn: ambiguous configuration for settling time, ignoring 'regulator-settling-time-down-us'\n",
np->name); np);
constraints->settling_time_down = 0; 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) { if (desc && desc->of_map_mode) {
mode = desc->of_map_mode(pval); mode = desc->of_map_mode(pval);
if (mode == REGULATOR_MODE_INVALID) 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 else
constraints->initial_mode = mode; constraints->initial_mode = mode;
} else { } else {
pr_warn("%s: mapping for mode %d not defined\n", pr_warn("%pOFn: mapping for mode %d not defined\n",
np->name, pval); np, pval);
} }
} }
@ -144,14 +144,14 @@ static void of_get_regulation_constraints(struct device_node *np,
ret = of_property_read_u32_index(np, ret = of_property_read_u32_index(np,
"regulator-allowed-modes", i, &pval); "regulator-allowed-modes", i, &pval);
if (ret) { if (ret) {
pr_err("%s: couldn't read allowed modes index %d, ret=%d\n", pr_err("%pOFn: couldn't read allowed modes index %d, ret=%d\n",
np->name, i, ret); np, i, ret);
break; break;
} }
mode = desc->of_map_mode(pval); mode = desc->of_map_mode(pval);
if (mode == REGULATOR_MODE_INVALID) if (mode == REGULATOR_MODE_INVALID)
pr_err("%s: invalid regulator-allowed-modes element %u\n", pr_err("%pOFn: invalid regulator-allowed-modes element %u\n",
np->name, pval); np, pval);
else else
constraints->valid_modes_mask |= mode; constraints->valid_modes_mask |= mode;
} }
@ -159,7 +159,7 @@ static void of_get_regulation_constraints(struct device_node *np,
constraints->valid_ops_mask constraints->valid_ops_mask
|= REGULATOR_CHANGE_MODE; |= REGULATOR_CHANGE_MODE;
} else { } 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) { if (desc && desc->of_map_mode) {
mode = desc->of_map_mode(pval); mode = desc->of_map_mode(pval);
if (mode == REGULATOR_MODE_INVALID) if (mode == REGULATOR_MODE_INVALID)
pr_err("%s: invalid mode %u\n", pr_err("%pOFn: invalid mode %u\n",
np->name, pval); np, pval);
else else
suspend_state->mode = mode; suspend_state->mode = mode;
} else { } else {
pr_warn("%s: mapping for mode %d not defined\n", pr_warn("%pOFn: mapping for mode %d not defined\n",
np->name, pval); np, pval);
} }
} }
@ -351,8 +351,8 @@ int of_regulator_match(struct device *dev, struct device_node *node,
match->desc); match->desc);
if (!match->init_data) { if (!match->init_data) {
dev_err(dev, dev_err(dev,
"failed to parse DT for regulator %s\n", "failed to parse DT for regulator %pOFn\n",
child->name); child);
of_node_put(child); of_node_put(child);
return -EINVAL; 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); init_data = of_get_regulator_init_data(dev, child, desc);
if (!init_data) { if (!init_data) {
dev_err(dev, dev_err(dev,
"failed to parse DT for regulator %s\n", "failed to parse DT for regulator %pOFn\n",
child->name); child);
break; break;
} }
if (desc->of_parse_cb) { if (desc->of_parse_cb) {
if (desc->of_parse_cb(child, desc, config)) { if (desc->of_parse_cb(child, desc, config)) {
dev_err(dev, dev_err(dev,
"driver callback failed to parse DT for regulator %s\n", "driver callback failed to parse DT for regulator %pOFn\n",
child->name); child);
init_data = NULL; init_data = NULL;
break; break;
} }

14
drivers/regulator/qcom-rpmh-regulator.c
View File

@ -414,7 +414,7 @@ static int rpmh_regulator_init_vreg(struct rpmh_vreg *vreg, struct device *dev,
break; break;
if (!rpmh_data->name) { if (!rpmh_data->name) {
dev_err(dev, "Unknown regulator %s\n", node->name); dev_err(dev, "Unknown regulator %pOFn\n", node);
return -EINVAL; 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); vreg->addr = cmd_db_read_addr(rpmh_resource_name);
if (!vreg->addr) { if (!vreg->addr) {
dev_err(dev, "%s: could not find RPMh address for resource %s\n", dev_err(dev, "%pOFn: could not find RPMh address for resource %s\n",
node->name, rpmh_resource_name); node, rpmh_resource_name);
return -ENODEV; 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); rdev = devm_regulator_register(dev, &vreg->rdesc, &reg_config);
if (IS_ERR(rdev)) { if (IS_ERR(rdev)) {
ret = PTR_ERR(rdev); ret = PTR_ERR(rdev);
dev_err(dev, "%s: devm_regulator_register() failed, ret=%d\n", dev_err(dev, "%pOFn: devm_regulator_register() failed, ret=%d\n",
node->name, ret); node, ret);
return ret; return ret;
} }
dev_dbg(dev, "%s regulator registered for RPMh resource %s @ 0x%05X\n", dev_dbg(dev, "%pOFn regulator registered for RPMh resource %s @ 0x%05X\n",
node->name, rpmh_resource_name, vreg->addr); node, rpmh_resource_name, vreg->addr);
return 0; return 0;
} }

12
drivers/regulator/s5m8767.c
View File

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