|
@@ -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;
|
|
|
}
|