2013-08-23 02:21:23

by Wei Yongjun

Subject: [PATCH -next] drm/rcar-du: fix return value check in rcar_du_lvdsenc_get_resources()

From: Wei Yongjun <[email protected]>

In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should be
replaced with IS_ERR(). Also remove the dev_err call to avoid redundant
error message.

Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
index a0f6a17..f59cbc4 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
@@ -151,11 +151,8 @@ static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds,
}

lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
- if (lvds->mmio == NULL) {
- dev_err(&pdev->dev, "failed to remap memory resource for %s\n",
- name);
- return -ENOMEM;
- }
+ if (IS_ERR(lvds->mmio))
+ return PTR_ERR(lvds->mmio);

lvds->clock = devm_clk_get(&pdev->dev, name);
if (IS_ERR(lvds->clock)) {

2013-08-23 11:09:11

by Laurent Pinchart

Subject: Re: [PATCH -next] drm/rcar-du: fix return value check in rcar_du_lvdsenc_get_resources()

Hello,

On Friday 23 August 2013 10:21:21 Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> In case of error, the function devm_ioremap_resource() returns ERR_PTR()
> and never returns NULL. The NULL test in the return value check should be
> replaced with IS_ERR(). Also remove the dev_err call to avoid redundant
> error message.
>
> Signed-off-by: Wei Yongjun <[email protected]>

Thank you for the patch.

> ---
> drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
> b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c index a0f6a17..f59cbc4 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
> @@ -151,11 +151,8 @@ static int rcar_du_lvdsenc_get_resources(struct
> rcar_du_lvdsenc *lvds, }
>
> lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);

devm_ioremap_resource() prints an error message when the second argument is
NULL, so we can remove the error check after the
platform_get_resource_byname() call as well. The resulting code could look
like

mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
lvds->mmio = devm_ioremap_resource(&pdev->dev, mem);
if (IS_ERR(lvds->mmio))
return PTR_ERR(lvds->mmio);

Could you please submit a v2 ?

> - if (lvds->mmio == NULL) {
> - dev_err(&pdev->dev, "failed to remap memory resource for %s\n",
> - name);
> - return -ENOMEM;
> - }
> + if (IS_ERR(lvds->mmio))
> + return PTR_ERR(lvds->mmio);
>
> lvds->clock = devm_clk_get(&pdev->dev, name);
> if (IS_ERR(lvds->clock)) {
--
Regards,

Laurent Pinchart