From: Liu Shixin <liushixin2@huawei.com>
Date: Tue, 15 Sep 2020 03:26:29 +0000 (+0800)
Subject: PM: AVS: qcom-cpr: simplify the return expression of cpr_disable()
X-Git-Tag: v5.15~2698^2^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3ffe2e7318ba705b8e0060d4696cafc75170e819;p=platform%2Fkernel%2Flinux-starfive.git

PM: AVS: qcom-cpr: simplify the return expression of cpr_disable()

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>
---

diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/power/avs/qcom-cpr.c
index bd7c3e4..b24cc77 100644
--- a/drivers/power/avs/qcom-cpr.c
+++ b/drivers/power/avs/qcom-cpr.c
@@ -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)) {
@@ -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)