diff mbox

[-next] drm/hisilicon: Fix return value check in ade_dts_parse()

Message ID 1466188173-19776-1-git-send-email-weiyj_lk@163.com (mailing list archive)
State New, archived
Headers show

Commit Message

weiyj_lk@163.com June 17, 2016, 6:29 p.m. UTC 
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

In case of error, the function devm_clk_get() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check
should be replaced with IS_ERR().

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Xinliang Liu June 20, 2016, 1:56 a.m. UTC | #1 
Hi,

On 18 June 2016 at 02:29,  <weiyj_lk@163.com> wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> In case of error, the function devm_clk_get() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check
> should be replaced with IS_ERR().
>
> Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>

Applied to drm-hisilicon-next. Thanks.

-xinliang

> ---
>  drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> index ed76baad..16834f4 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> @@ -965,21 +965,21 @@ static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx)
>         }
>
>         ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core");
> -       if (!ctx->ade_core_clk) {
> +       if (IS_ERR(ctx->ade_core_clk)) {
>                 DRM_ERROR("failed to parse clk ADE_CORE\n");
> -               return -ENODEV;
> +               return PTR_ERR(ctx->ade_core_clk);
>         }
>
>         ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg");
> -       if (!ctx->media_noc_clk) {
> +       if (IS_ERR(ctx->media_noc_clk)) {
>                 DRM_ERROR("failed to parse clk CODEC_JPEG\n");
> -           return -ENODEV;
> +               return PTR_ERR(ctx->media_noc_clk);
>         }
>
>         ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix");
> -       if (!ctx->ade_pix_clk) {
> +       if (IS_ERR(ctx->ade_pix_clk)) {
>                 DRM_ERROR("failed to parse clk ADE_PIX\n");
> -           return -ENODEV;
> +               return PTR_ERR(ctx->ade_pix_clk);
>         }
>
>         return 0;
>
>
>
>
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff mbox

Patch

diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index ed76baad..16834f4 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -965,21 +965,21 @@  static int ade_dts_parse(struct platform_device *pdev, struct ade_hw_ctx *ctx)
 	}
 
 	ctx->ade_core_clk = devm_clk_get(dev, "clk_ade_core");
-	if (!ctx->ade_core_clk) {
+	if (IS_ERR(ctx->ade_core_clk)) {
 		DRM_ERROR("failed to parse clk ADE_CORE\n");
-		return -ENODEV;
+		return PTR_ERR(ctx->ade_core_clk);
 	}
 
 	ctx->media_noc_clk = devm_clk_get(dev, "clk_codec_jpeg");
-	if (!ctx->media_noc_clk) {
+	if (IS_ERR(ctx->media_noc_clk)) {
 		DRM_ERROR("failed to parse clk CODEC_JPEG\n");
-	    return -ENODEV;
+		return PTR_ERR(ctx->media_noc_clk);
 	}
 
 	ctx->ade_pix_clk = devm_clk_get(dev, "clk_ade_pix");
-	if (!ctx->ade_pix_clk) {
+	if (IS_ERR(ctx->ade_pix_clk)) {
 		DRM_ERROR("failed to parse clk ADE_PIX\n");
-	    return -ENODEV;
+		return PTR_ERR(ctx->ade_pix_clk);
 	}
 
 	return 0;