2017-08-29 13:43:34

by Himanshu Jha

Subject: [PATCH] remoteproc: qcom: Use PTR_ERR_OR_ZERO

Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR

Signed-off-by: Himanshu Jha <[email protected]>
---
drivers/remoteproc/qcom_adsp_pil.c | 5 +----
drivers/remoteproc/qcom_common.c | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index a41d399..d01a8da 100644
--- a/drivers/remoteproc/qcom_adsp_pil.c
+++ b/drivers/remoteproc/qcom_adsp_pil.c
@@ -268,10 +268,7 @@ static int adsp_init_regulator(struct qcom_adsp *adsp)
regulator_set_load(adsp->cx_supply, 100000);

adsp->px_supply = devm_regulator_get(adsp->dev, "px");
- if (IS_ERR(adsp->px_supply))
- return PTR_ERR(adsp->px_supply);
-
- return 0;
+ return PTR_ERR_OR_ZERO(adsp->px_supply);
}

static int adsp_request_irq(struct qcom_adsp *adsp,
diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
index 31b8291..7b40b79 100644
--- a/drivers/remoteproc/qcom_common.c
+++ b/drivers/remoteproc/qcom_common.c
@@ -55,7 +55,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev)

smd->edge = qcom_smd_register_edge(smd->dev, smd->node);

- return IS_ERR(smd->edge) ? PTR_ERR(smd->edge) : 0;
+ return PTR_ERR_OR_ZERO(smd->edge);
}

static void smd_subdev_remove(struct rproc_subdev *subdev)
--
2.7.4

2017-08-29 22:35:19

by Bjorn Andersson

Subject: Re: [PATCH] remoteproc: qcom: Use PTR_ERR_OR_ZERO

On Tue 29 Aug 06:43 PDT 2017, Himanshu Jha wrote:

> Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
>

Applied for v4.14

Thank you,
Bjorn

> Signed-off-by: Himanshu Jha <[email protected]>
> ---
> drivers/remoteproc/qcom_adsp_pil.c | 5 +----
> drivers/remoteproc/qcom_common.c | 2 +-
> 2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
> index a41d399..d01a8da 100644
> --- a/drivers/remoteproc/qcom_adsp_pil.c
> +++ b/drivers/remoteproc/qcom_adsp_pil.c
> @@ -268,10 +268,7 @@ static int adsp_init_regulator(struct qcom_adsp *adsp)
> regulator_set_load(adsp->cx_supply, 100000);
>
> adsp->px_supply = devm_regulator_get(adsp->dev, "px");
> - if (IS_ERR(adsp->px_supply))
> - return PTR_ERR(adsp->px_supply);
> -
> - return 0;
> + return PTR_ERR_OR_ZERO(adsp->px_supply);
> }
>
> static int adsp_request_irq(struct qcom_adsp *adsp,
> diff --git a/drivers/remoteproc/qcom_common.c b/drivers/remoteproc/qcom_common.c
> index 31b8291..7b40b79 100644
> --- a/drivers/remoteproc/qcom_common.c
> +++ b/drivers/remoteproc/qcom_common.c
> @@ -55,7 +55,7 @@ static int smd_subdev_probe(struct rproc_subdev *subdev)
>
> smd->edge = qcom_smd_register_edge(smd->dev, smd->node);
>
> - return IS_ERR(smd->edge) ? PTR_ERR(smd->edge) : 0;
> + return PTR_ERR_OR_ZERO(smd->edge);
> }
>
> static void smd_subdev_remove(struct rproc_subdev *subdev)
> --
> 2.7.4
>