From: Viresh Kumar <viresh.kumar@linaro.org>
To: Dmitry Osipenko <digetx@gmail.com>,
Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
linux-pm@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Rafael Wysocki <rjw@rjwysocki.net>,
Sibi Sankar <sibis@codeaurora.org>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 08/13] opp: Update parameters of _set_opp_custom()
Date: Thu, 21 Jan 2021 16:47:48 +0530 [thread overview]
Message-ID: <296a3a64a673ed3eb261a6fc06f4dfd90dbca479.1611227342.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1611227342.git.viresh.kumar@linaro.org>
Drop the unnecessary parameters and follow the pattern from
_generic_set_opp_regulator().
While at it, also remove the local variable old_freq.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/opp/core.c | 22 +++++++++-------------
1 file changed, 9 insertions(+), 13 deletions(-)
diff --git a/drivers/opp/core.c b/drivers/opp/core.c
index 6b09d468d37a..3500cc9de66b 100644
--- a/drivers/opp/core.c
+++ b/drivers/opp/core.c
@@ -826,11 +826,10 @@ static int _set_opp_bw(const struct opp_table *opp_table,
}
static int _set_opp_custom(const struct opp_table *opp_table,
- struct device *dev, unsigned long old_freq,
- unsigned long freq,
- struct dev_pm_opp_supply *old_supply,
- struct dev_pm_opp_supply *new_supply)
+ struct device *dev, struct dev_pm_opp *opp,
+ unsigned long freq)
{
+ struct dev_pm_opp *old_opp = opp_table->current_opp;
struct dev_pm_set_opp_data *data;
int size;
@@ -840,12 +839,12 @@ static int _set_opp_custom(const struct opp_table *opp_table,
data->clk = opp_table->clk;
data->dev = dev;
- data->old_opp.rate = old_freq;
- size = sizeof(*old_supply) * opp_table->regulator_count;
- memcpy(data->old_opp.supplies, old_supply, size);
+ data->old_opp.rate = old_opp->rate;
+ size = sizeof(*old_opp->supplies) * opp_table->regulator_count;
+ memcpy(data->old_opp.supplies, old_opp->supplies, size);
data->new_opp.rate = freq;
- memcpy(data->new_opp.supplies, new_supply, size);
+ memcpy(data->new_opp.supplies, opp->supplies, size);
return opp_table->set_opp(data);
}
@@ -1000,7 +999,6 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
struct dev_pm_opp *opp, unsigned long freq)
{
struct dev_pm_opp *old_opp;
- unsigned long old_freq;
int scaling_down, ret;
if (unlikely(!opp))
@@ -1011,7 +1009,6 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
_find_current_opp(dev, opp_table);
old_opp = opp_table->current_opp;
- old_freq = old_opp->rate;
/* Return early if nothing to do */
if (opp_table->enabled && old_opp == opp) {
@@ -1020,7 +1017,7 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
}
dev_dbg(dev, "%s: switching OPP: Freq %lu -> %lu Hz, Level %u -> %u, Bw %u -> %u\n",
- __func__, old_freq, freq, old_opp->level, opp->level,
+ __func__, old_opp->rate, freq, old_opp->level, opp->level,
old_opp->bandwidth ? old_opp->bandwidth[0].peak : 0,
opp->bandwidth ? opp->bandwidth[0].peak : 0);
@@ -1036,8 +1033,7 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,
}
if (opp_table->set_opp) {
- ret = _set_opp_custom(opp_table, dev, old_freq, freq,
- old_opp->supplies, opp->supplies);
+ ret = _set_opp_custom(opp_table, dev, opp, freq);
} else if (opp_table->regulators) {
ret = _generic_set_opp_regulator(opp_table, dev, opp, freq,
scaling_down);
--
2.25.0.rc1.19.g042ed3e048af
next prev parent reply other threads:[~2021-01-21 11:23 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 11:17 [PATCH 00/13] opp: Implement dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 01/13] opp: Rename _opp_set_rate_zero() Viresh Kumar
2021-01-21 11:17 ` [PATCH 02/13] opp: No need to check clk for errors Viresh Kumar
2021-01-21 11:17 ` [PATCH 03/13] opp: Keep track of currently programmed OPP Viresh Kumar
2021-01-21 21:41 ` Dmitry Osipenko
2021-01-22 4:45 ` Viresh Kumar
2021-01-22 14:31 ` Dmitry Osipenko
2021-01-25 3:12 ` Viresh Kumar
2021-01-27 16:31 ` Akhil P Oommen
2021-01-28 4:14 ` Viresh Kumar
2021-07-07 10:24 ` Ionela Voinescu
2021-07-08 7:53 ` Viresh Kumar
2021-07-09 8:57 ` Ionela Voinescu
2021-07-12 4:14 ` Viresh Kumar
2021-01-21 11:17 ` [PATCH 04/13] opp: Split _set_opp() out of dev_pm_opp_set_rate() Viresh Kumar
2021-01-21 11:17 ` [PATCH 05/13] opp: Allow _set_opp() to work for non-freq devices Viresh Kumar
2021-01-21 11:17 ` [PATCH 06/13] opp: Allow _generic_set_opp_regulator() " Viresh Kumar
2021-01-21 11:17 ` [PATCH 07/13] opp: Allow _generic_set_opp_clk_only() " Viresh Kumar
2021-01-21 20:26 ` Dmitry Osipenko
2021-01-22 4:35 ` Viresh Kumar
2021-01-25 21:09 ` Dmitry Osipenko
2021-01-27 6:58 ` Viresh Kumar
2021-01-21 11:17 ` Viresh Kumar [this message]
2021-01-21 11:17 ` [PATCH 09/13] opp: Implement dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 10/13] cpufreq: qcom: Migrate to dev_pm_opp_set_opp() Viresh Kumar
2021-01-21 11:17 ` [PATCH 11/13] devfreq: tegra30: " Viresh Kumar
2021-01-21 21:36 ` Dmitry Osipenko
2021-01-22 6:26 ` Viresh Kumar
2021-01-22 15:28 ` Dmitry Osipenko
2021-01-25 3:14 ` Viresh Kumar
2021-01-25 16:00 ` Dmitry Osipenko
2021-01-27 9:10 ` [PATCH V2 " Viresh Kumar
2021-01-27 10:02 ` Viresh Kumar
2021-01-27 15:58 ` Dmitry Osipenko
2021-01-28 7:01 ` Viresh Kumar
2021-02-01 0:21 ` Chanwoo Choi
2021-02-01 19:57 ` Dmitry Osipenko
2021-01-21 11:17 ` [PATCH 12/13] drm: msm: " Viresh Kumar
2021-01-21 11:17 ` [PATCH 13/13] opp: Remove dev_pm_opp_set_bw() Viresh Kumar
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=296a3a64a673ed3eb261a6fc06f4dfd90dbca479.1611227342.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=digetx@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@kernel.org \
--cc=sibis@codeaurora.org \
--cc=vincent.guittot@linaro.org \
--cc=vireshk@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).