diff options
| author | Himanshu Jha <himanshujha199640@gmail.com> | 2017-08-29 19:13:18 +0530 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2017-08-29 15:34:19 -0700 |
| commit | c76929b3c695305c1055d7e7c935d35b5fd275be (patch) | |
| tree | d01f3cf37c417f2998dec4aef3f019134c9d8c71 /drivers/remoteproc | |
| parent | 1e13c7fb49ed11f598ce62077fae2286b385558f (diff) | |
| download | linux-stable-c76929b3c695305c1055d7e7c935d35b5fd275be.tar.gz linux-stable-c76929b3c695305c1055d7e7c935d35b5fd275be.tar.bz2 linux-stable-c76929b3c695305c1055d7e7c935d35b5fd275be.zip | |
remoteproc: qcom: Use PTR_ERR_OR_ZERO
Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR
Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Diffstat (limited to 'drivers/remoteproc')
| -rw-r--r-- | drivers/remoteproc/qcom_adsp_pil.c | 5 | ||||
| -rw-r--r-- | 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 a41d399766fd..d01a8daf948a 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 31b8291dfc8b..7b40b79f8d9c 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) |