2020-09-15 03:08:47

by Liu Shixin

Subject: [PATCH -next] power: avs: qcom-cpr: simplify the return expression of cpr_disable()

Simplify the return expression.

Signed-off-by: Liu Shixin <[email protected]>
---
drivers/power/avs/qcom-cpr.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/power/avs/qcom-cpr.c
index bd7c3e48b386..b24cc77d1889 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)
--
2.25.1

2020-09-15 03:18:36

by Bjorn Andersson

Subject: Re: [PATCH -next] power: avs: qcom-cpr: simplify the return expression of cpr_disable()

On Mon 14 Sep 22:26 CDT 2020, Liu Shixin wrote:

> Simplify the return expression.
>
> Signed-off-by: Liu Shixin <[email protected]>

Reviewed-by: Bjorn Andersson <[email protected]>

> ---
> drivers/power/avs/qcom-cpr.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/power/avs/qcom-cpr.c
> index bd7c3e48b386..b24cc77d1889 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)
> --
> 2.25.1
>

2020-09-18 20:15:36

by Kevin Hilman

Subject: Re: [PATCH -next] power: avs: qcom-cpr: simplify the return expression of cpr_disable()

Bjorn Andersson <[email protected]> writes:

> On Mon 14 Sep 22:26 CDT 2020, Liu Shixin wrote:
>
>> Simplify the return expression.
>>
>> Signed-off-by: Liu Shixin <[email protected]>
>
> Reviewed-by: Bjorn Andersson <[email protected]>

Acked-by: Kevin Hilman <[email protected]>

Rafael, please apply directly.

2020-09-22 16:10:23

by Rafael J. Wysocki

Subject: Re: [PATCH -next] power: avs: qcom-cpr: simplify the return expression of cpr_disable()

On Fri, Sep 18, 2020 at 10:12 PM Kevin Hilman <[email protected]> wrote:
>
> Bjorn Andersson <[email protected]> writes:
>
> > On Mon 14 Sep 22:26 CDT 2020, Liu Shixin wrote:
> >
> >> Simplify the return expression.
> >>
> >> Signed-off-by: Liu Shixin <[email protected]>
> >
> > Reviewed-by: Bjorn Andersson <[email protected]>
>
> Acked-by: Kevin Hilman <[email protected]>
>
> Rafael, please apply directly.

Applied as 5.10 material with minor edits in the subject, thanks!