* [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse()
@ 2016-06-17 18:29 weiyj_lk
2016-06-18 1:29 ` Chen Feng
2016-06-20 1:56 ` Xinliang Liu
0 siblings, 2 replies; 5+ messages in thread
From: weiyj_lk @ 2016-06-17 18:29 UTC (permalink / raw)
To: Xinliang Liu, Xinwei Kong, Chen Feng, David Airlie
Cc: Wei Yongjun, dri-devel, linux-kernel
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(-)
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;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse()
2016-06-17 18:29 [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse() weiyj_lk
@ 2016-06-18 1:29 ` Chen Feng
2016-06-20 1:56 ` Xinliang Liu
1 sibling, 0 replies; 5+ messages in thread
From: Chen Feng @ 2016-06-18 1:29 UTC (permalink / raw)
To: weiyj_lk, Xinliang Liu, Xinwei Kong, David Airlie
Cc: Wei Yongjun, dri-devel, linux-kernel
Thanks!
On 2016/6/18 2: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>
Reviewed-by: Chen Feng <puck.chen@hisilicon.com>
> ---
> 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;
>
>
>
>
>
>
> .
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse()
2016-06-17 18:29 [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse() weiyj_lk
2016-06-18 1:29 ` Chen Feng
@ 2016-06-20 1:56 ` Xinliang Liu
1 sibling, 0 replies; 5+ messages in thread
From: Xinliang Liu @ 2016-06-20 1:56 UTC (permalink / raw)
To: weiyj_lk
Cc: Xinliang Liu, Xinwei Kong, Chen Feng, David Airlie, Wei Yongjun,
Linux Kernel Mailing List, dri-devel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse()
@ 2016-07-13 12:43 weiyj_lk
2016-07-18 1:23 ` Xinliang Liu
0 siblings, 1 reply; 5+ messages in thread
From: weiyj_lk @ 2016-07-13 12:43 UTC (permalink / raw)
To: Xinliang Liu, Xinwei Kong, Chen Feng, David Airlie
Cc: Wei Yongjun, dri-devel, linux-kernel
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(-)
diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
index 805f432..c3707d4 100644
--- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
+++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
@@ -967,21 +967,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;
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse()
2016-07-13 12:43 weiyj_lk
@ 2016-07-18 1:23 ` Xinliang Liu
0 siblings, 0 replies; 5+ messages in thread
From: Xinliang Liu @ 2016-07-18 1:23 UTC (permalink / raw)
To: weiyj_lk
Cc: Xinliang Liu, Xinwei Kong, Chen Feng, David Airlie, Wei Yongjun,
Linux Kernel Mailing List, dri-devel
On 13 July 2016 at 20:43, <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>
Hi, thanks. This patch had already applied to drm-hisilicon-next.
> ---
> 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 805f432..c3707d4 100644
> --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c
> @@ -967,21 +967,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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-07-18 1:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-17 18:29 [PATCH -next] drm/hisilicon: Fix return value check in ade_dts_parse() weiyj_lk
2016-06-18 1:29 ` Chen Feng
2016-06-20 1:56 ` Xinliang Liu
-- strict thread matches above, loose matches on Subject: below --
2016-07-13 12:43 weiyj_lk
2016-07-18 1:23 ` Xinliang Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox