From: Viresh Kumar <viresh.kumar@linaro.org>
To: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Cc: Lee Jones <lee.jones@linaro.org>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Stephen Boyd <sboyd@codeaurora.org>,
nm@ti.com, linaro-kernel@lists.linaro.org,
linux-pm@vger.kernel.org, Dmitry Torokhov <dtor@chromium.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Len Brown <len.brown@intel.com>,
open list <linux-kernel@vger.kernel.org>,
Pavel Machek <pavel@ucw.cz>, Shawn Guo <shawnguo@kernel.org>,
linux-samsung-soc@vger.kernel.org
Subject: Re: [PATCH] PM / OPP: Fix parsing of opp-microvolt and opp-microamp properties
Date: Thu, 17 Dec 2015 07:31:33 +0530 [thread overview]
Message-ID: <20151217020133.GD3496@ubuntu> (raw)
In-Reply-To: <18360458.m71vGHrTb9@amdc1976>
On 16-12-15, 16:41, Bartlomiej Zolnierkiewicz wrote:
> Commit 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name>'
> bindings") broke support for parsing standard opp-microvolt and
> opp-microamp properties. Fix it by setting 'name' string to
> proper value for !dev_opp->prop_name cases.
>
> Cc: Viresh Kumar <viresh.kumar@linaro.org>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> Fixes: 01fb4d3c39d3 ("PM / OPP: Parse 'opp-<prop>-<name> 'bindings")
> Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
> ---
> This fixes Exynos4x12 cpufreq-dt support regression present in
> linux-pm/linux-next tree. Rafael, please apply. Thank you.
>
> drivers/base/power/opp/core.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> Index: b/drivers/base/power/opp/core.c
> ===================================================================
> --- a/drivers/base/power/opp/core.c 2015-12-16 16:10:13.509171420 +0100
> +++ b/drivers/base/power/opp/core.c 2015-12-16 16:21:18.385183902 +0100
> @@ -806,11 +806,11 @@ static int opp_parse_supplies(struct dev
> struct property *prop = NULL;
> char name[NAME_MAX];
>
> + sprintf(name, "opp-microvolt-%s", dev_opp->prop_name);
> +
> /* Search for "opp-microvolt-<name>" */
> - if (dev_opp->prop_name) {
> - sprintf(name, "opp-microvolt-%s", dev_opp->prop_name);
> + if (dev_opp->prop_name)
> prop = of_find_property(opp->np, name, NULL);
> - }
>
> if (!prop) {
> /* Search for "opp-microvolt" */
> @@ -848,10 +848,10 @@ static int opp_parse_supplies(struct dev
>
> /* Search for "opp-microamp-<name>" */
> prop = NULL;
> - if (dev_opp->prop_name) {
> - sprintf(name, "opp-microamp-%s", dev_opp->prop_name);
> + sprintf(name, "opp-microamp-%s", dev_opp->prop_name);
> +
> + if (dev_opp->prop_name)
> prop = of_find_property(opp->np, name, NULL);
> - }
>
> if (!prop) {
> /* Search for "opp-microamp" */
Sorry about this. And I am disliking the solution suggested by Stephen
more and more now. Please resend this patch with following changes
instead:
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index 6c6856e426f0..a96df5cda303 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -816,7 +816,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
if (!prop) {
/* Search for "opp-microvolt" */
- name[13] = '\0';
+ sprintf(name, "opp-microvolt");
prop = of_find_property(opp->np, name, NULL);
/* Missing property isn't a problem, but an invalid entry is */
@@ -857,7 +857,7 @@ static int opp_parse_supplies(struct dev_pm_opp *opp, struct device *dev,
if (!prop) {
/* Search for "opp-microamp" */
- name[12] = '\0';
+ sprintf(name, "opp-microamp");
prop = of_find_property(opp->np, name, NULL);
}
--
viresh
prev parent reply other threads:[~2015-12-17 2:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-16 15:41 [PATCH] PM / OPP: Fix parsing of opp-microvolt and opp-microamp properties Bartlomiej Zolnierkiewicz
2015-12-17 2:01 ` Viresh Kumar [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151217020133.GD3496@ubuntu \
--to=viresh.kumar@linaro.org \
--cc=b.zolnierkie@samsung.com \
--cc=dtor@chromium.org \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=len.brown@intel.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=nm@ti.com \
--cc=pavel@ucw.cz \
--cc=rafael.j.wysocki@intel.com \
--cc=sboyd@codeaurora.org \
--cc=shawnguo@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).