Skip to content

Commit

Permalink
soc: qcom: rpmhpd: Use corner in power_off
Browse files Browse the repository at this point in the history
[ Upstream commit d43b3a9 ]

rpmhpd_aggregate_corner() takes a corner as parameter, but in
rpmhpd_power_off() the code requests the level of the first corner
instead.

In all (known) current cases the first corner has level 0, so this
change should be a nop, but in case that there's a power domain with a
non-zero lowest level this makes sure that rpmhpd_power_off() actually
requests the lowest level - which is the closest to "power off" we can
get.

While touching the code, also skip the unnecessary zero-initialization
of "ret".

Fixes: 279b7e8 ("soc: qcom: rpmhpd: Add RPMh power domain driver")
Reviewed-by: Rajendra Nayak <rnayak@codeaurora.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Sibi Sankar <sibis@codeaurora.org>
Tested-by: Sibi Sankar <sibis@codeaurora.org>
Link: https://lore.kernel.org/r/20210703005416.2668319-2-bjorn.andersson@linaro.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
andersson authored and gregkh committed Sep 15, 2021
1 parent aa858d8 commit 85c88e9
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions drivers/soc/qcom/rpmhpd.c
Expand Up @@ -382,12 +382,11 @@ static int rpmhpd_power_on(struct generic_pm_domain *domain)
static int rpmhpd_power_off(struct generic_pm_domain *domain)
{
struct rpmhpd *pd = domain_to_rpmhpd(domain);
int ret = 0;
int ret;

mutex_lock(&rpmhpd_lock);

ret = rpmhpd_aggregate_corner(pd, pd->level[0]);

ret = rpmhpd_aggregate_corner(pd, 0);
if (!ret)
pd->enabled = false;

Expand Down

0 comments on commit 85c88e9

Please sign in to comment.