Message ID | 1476946796-27698-1-git-send-email-yamada.masahiro@socionext.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
On 20-10-16, 15:59, Masahiro Yamada wrote: > These log messages are wrong because _of_get_opp_desc_node() returns > an operating-points-v2 node. > > Commit a6eed752f5fb ("PM / OPP: passing NULL to PTR_ERR()") fixed > static checker warnings, and reworded the messages at the same time > (but the latter was not mentioned in the git-log). > > Restore the correct messages, dropping __func__. We can grep the > message string, so the function name would not carry much value. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > Changes in v2: > - Reword git-log slightly > comments -> log messages > > drivers/base/power/opp/of.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c > index 6480137..92e6d53 100644 > --- a/drivers/base/power/opp/of.c > +++ b/drivers/base/power/opp/of.c > @@ -562,7 +562,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, > /* Get OPP descriptor node */ > np = _of_get_opp_desc_node(cpu_dev); > if (!np) { > - dev_dbg(cpu_dev, "%s: Couldn't find cpu_dev node.\n", __func__); > + dev_dbg(cpu_dev, "Couldn't find opp node.\n"); > return -ENOENT; > } > > @@ -587,8 +587,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, > /* Get OPP descriptor node */ > tmp_np = _of_get_opp_desc_node(tcpu_dev); > if (!tmp_np) { > - dev_err(tcpu_dev, "%s: Couldn't find tcpu_dev node.\n", > - __func__); > + dev_err(tcpu_dev, "Couldn't find opp node.\n"); The error messages are very generic and it can get tricky to grep for them in the source code.. I would prefer keeping function name in the print message.
diff --git a/drivers/base/power/opp/of.c b/drivers/base/power/opp/of.c index 6480137..92e6d53 100644 --- a/drivers/base/power/opp/of.c +++ b/drivers/base/power/opp/of.c @@ -562,7 +562,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, /* Get OPP descriptor node */ np = _of_get_opp_desc_node(cpu_dev); if (!np) { - dev_dbg(cpu_dev, "%s: Couldn't find cpu_dev node.\n", __func__); + dev_dbg(cpu_dev, "Couldn't find opp node.\n"); return -ENOENT; } @@ -587,8 +587,7 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev, /* Get OPP descriptor node */ tmp_np = _of_get_opp_desc_node(tcpu_dev); if (!tmp_np) { - dev_err(tcpu_dev, "%s: Couldn't find tcpu_dev node.\n", - __func__); + dev_err(tcpu_dev, "Couldn't find opp node.\n"); ret = -ENOENT; goto put_cpu_node; }
These log messages are wrong because _of_get_opp_desc_node() returns an operating-points-v2 node. Commit a6eed752f5fb ("PM / OPP: passing NULL to PTR_ERR()") fixed static checker warnings, and reworded the messages at the same time (but the latter was not mentioned in the git-log). Restore the correct messages, dropping __func__. We can grep the message string, so the function name would not carry much value. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Reword git-log slightly comments -> log messages drivers/base/power/opp/of.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)