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 and check for return value of platform_get_resource_byname().
Signed-off-by: Wei Yongjun <[email protected]>
---
v1 -> v2; remove return value check of platform_get_resource_byname()
---
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 13 ++-----------
1 file changed, 2 insertions(+), 11 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..fe1f6f5 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
@@ -144,18 +144,9 @@ static int rcar_du_lvdsenc_get_resources(struct rcar_du_lvdsenc *lvds,
sprintf(name, "lvds.%u", lvds->index);
mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
- if (mem == NULL) {
- dev_err(&pdev->dev, "failed to get memory resource for %s\n",
- name);
- return -EINVAL;
- }
-
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)) {
On Friday 23 August 2013 21:15:16 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 and check for return value of platform_get_resource_byname().
>
> Signed-off-by: Wei Yongjun <[email protected]>
Acked-by: Laurent Pinchart <[email protected]>
Dave, could you please pick the patch up ?
> ---
> v1 -> v2; remove return value check of platform_get_resource_byname()
> ---
> drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 13 ++-----------
> 1 file changed, 2 insertions(+), 11 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..fe1f6f5 100644
> --- a/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
> +++ b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c
> @@ -144,18 +144,9 @@ static int rcar_du_lvdsenc_get_resources(struct
> rcar_du_lvdsenc *lvds, sprintf(name, "lvds.%u", lvds->index);
>
> mem = platform_get_resource_byname(pdev, IORESOURCE_MEM, name);
> - if (mem == NULL) {
> - dev_err(&pdev->dev, "failed to get memory resource for %s\n",
> - name);
> - return -EINVAL;
> - }
> -
> 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)) {
--
Regards,
Laurent Pinchart