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]>
Signed-off-by: Bjorn Andersson <[email protected]>

diff --git a/drivers/remoteproc/qcom_adsp_pil.c b/drivers/remoteproc/qcom_adsp_pil.c
index a41d399766fdce4760a9ac906929947c1af3c7b7..d01a8daf948ace449a0281532fc37f8fff184452 100644 (file)
--- 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 31b8291dfc8b33eda6a851435d6bebb13ffaf900..7b40b79f8d9c1c77a61f5d954713b41a992986ab 100644 (file)
--- 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)