Skip to content

Commit

Permalink
PM: AVS: qcom-cpr: simplify the return expression of cpr_disable()
Browse files Browse the repository at this point in the history
Simplify the return expression.

Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Kevin Hilman <khilman@baylibre.com>
[ rjw: Minor subject edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Liu Shixin authored and Rafael J. Wysocki committed Sep 22, 2020
1 parent ba4f184 commit 3ffe2e7
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions drivers/power/avs/qcom-cpr.c
Original file line number Diff line number Diff line change
Expand Up @@ -665,8 +665,6 @@ static int cpr_enable(struct cpr_drv *drv)

static int cpr_disable(struct cpr_drv *drv)
{
int ret;

mutex_lock(&drv->lock);

if (cpr_is_allowed(drv)) {
Expand All @@ -676,11 +674,7 @@ static int cpr_disable(struct cpr_drv *drv)

mutex_unlock(&drv->lock);

ret = regulator_disable(drv->vdd_apc);
if (ret)
return ret;

return 0;
return regulator_disable(drv->vdd_apc);
}

static int cpr_config(struct cpr_drv *drv)
Expand Down

0 comments on commit 3ffe2e7

Please sign in to comment.