Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753931AbdH2Nne (ORCPT ); Tue, 29 Aug 2017 09:43:34 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33031 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751512AbdH2Nnc (ORCPT ); Tue, 29 Aug 2017 09:43:32 -0400 X-Google-Smtp-Source: ADKCNb6fJ51XuLNFVNFLK5om1NXQNTPhtCNVUfuDeAkUK6NN5q0nlz9jIiBW14smwTZfsI7doHx6GQ== From: Himanshu Jha To: ohad@wizery.com Cc: bjorn.andersson@linaro.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Himanshu Jha Subject: [PATCH] remoteproc: qcom: Use PTR_ERR_OR_ZERO Date: Tue, 29 Aug 2017 19:13:18 +0530 Message-Id: <1504014198-16588-1-git-send-email-himanshujha199640@gmail.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1314 Lines: 39 Use PTR_ERR_OR_ZERO rather than if(IS_ERR(...)) + PTR_ERR Signed-off-by: Himanshu Jha --- 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