From: Viresh Kumar <viresh.kumar@linaro.org>
To: Rafael Wysocki <rjw@rjwysocki.net>,
Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: linaro-kernel@lists.linaro.org, linux-pm@vger.kernel.org,
linux-kernel@vger.kernel.org,
Vincent Guittot <vincent.guittot@linaro.org>,
Viresh Kumar <viresh.kumar@linaro.org>
Subject: [PATCH V2 10/12] PM / OPP: Simplify _opp_set_availability()
Date: Mon, 23 Jan 2017 10:11:50 +0530 [thread overview]
Message-ID: <59507c403d7319f7ec1ac463e77f4dbfb36371d7.1485146406.git.viresh.kumar@linaro.org> (raw)
In-Reply-To: <cover.1485146406.git.viresh.kumar@linaro.org>
In-Reply-To: <cover.1485146406.git.viresh.kumar@linaro.org>
As we don't use RCU locking anymore, there is no need to replace an
earlier OPP node with a new one. Just update the existing one.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
---
drivers/base/power/opp/core.c | 27 +++++----------------------
1 file changed, 5 insertions(+), 22 deletions(-)
diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
index c40d9868bd97..f54ac2484723 100644
--- a/drivers/base/power/opp/core.c
+++ b/drivers/base/power/opp/core.c
@@ -1510,20 +1510,15 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,
bool availability_req)
{
struct opp_table *opp_table;
- struct dev_pm_opp *new_opp, *tmp_opp, *opp = ERR_PTR(-ENODEV);
+ struct dev_pm_opp *tmp_opp, *opp = ERR_PTR(-ENODEV);
int r = 0;
- /* keep the node allocated */
- new_opp = kmalloc(sizeof(*new_opp), GFP_KERNEL);
- if (!new_opp)
- return -ENOMEM;
-
/* Find the opp_table */
opp_table = _find_opp_table(dev);
if (IS_ERR(opp_table)) {
r = PTR_ERR(opp_table);
dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r);
- goto free_opp;
+ return r;
}
mutex_lock(&opp_table->lock);
@@ -1544,32 +1539,20 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,
/* Is update really needed? */
if (opp->available == availability_req)
goto unlock;
- /* copy the old data over */
- *new_opp = *opp;
-
- /* plug in new node */
- new_opp->available = availability_req;
- list_replace(&opp->node, &new_opp->node);
- kfree(opp);
+ opp->available = availability_req;
/* Notify the change of the OPP availability */
if (availability_req)
blocking_notifier_call_chain(&opp_table->head, OPP_EVENT_ENABLE,
- new_opp);
+ opp);
else
blocking_notifier_call_chain(&opp_table->head,
- OPP_EVENT_DISABLE, new_opp);
-
- mutex_unlock(&opp_table->lock);
- dev_pm_opp_put_opp_table(opp_table);
- return 0;
+ OPP_EVENT_DISABLE, opp);
unlock:
mutex_unlock(&opp_table->lock);
dev_pm_opp_put_opp_table(opp_table);
-free_opp:
- kfree(new_opp);
return r;
}
--
2.7.1.410.g6faf27b
next prev parent reply other threads:[~2017-01-23 4:41 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 4:41 [PATCH V2 00/12] PM / OPP: Use kref and move away from RCU locking Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 01/12] PM / OPP: Add per OPP table mutex Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 02/12] PM / OPP: Add 'struct kref' to OPP table Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 03/12] PM / OPP: Return opp_table from dev_pm_opp_set_*() routines Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 04/12] PM / OPP: Take reference of the OPP table while adding/removing OPPs Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 05/12] PM / OPP: Use dev_pm_opp_get_opp_table() instead of _add_opp_table() Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 06/12] PM / OPP: Add 'struct kref' to struct dev_pm_opp Viresh Kumar
[not found] ` <cover.1485146406.git.viresh.kumar-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2017-01-23 4:41 ` [PATCH V2 07/12] PM / OPP: Update OPP users to put reference Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 08/12] PM / OPP: Take kref from _find_opp_table() Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 09/12] PM / OPP: Move away from RCU locking Viresh Kumar
2017-01-23 4:41 ` Viresh Kumar [this message]
2017-01-23 4:41 ` [PATCH V2 11/12] PM / OPP: Simplify dev_pm_opp_get_max_volt_latency() Viresh Kumar
2017-01-23 4:41 ` [PATCH V2 12/12] PM / OPP: Update Documentation to remove RCU specific bits Viresh Kumar
[not found] ` <CGME20170123044228epcas3p35fdbe94a890062e9d66e33a3b5e4d571@epcas3p3.samsung.com>
2017-01-31 7:17 ` [PATCH V2 07/12] PM / OPP: Update OPP users to put reference MyungJoo Ham
2017-01-31 8:47 ` 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=59507c403d7319f7ec1ac463e77f4dbfb36371d7.1485146406.git.viresh.kumar@linaro.org \
--to=viresh.kumar@linaro.org \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@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).