[PATCH v1 5/7] drm/stm: ltdc: add devm_reset_control & platform_get_ressource

[Benjamin Gaignard]

2017-07-18 12:20 GMT+02:00 Philippe CORNU <philippe.cornu at st.com>:
> Use devm_reset_control_get to avoid resource leakage.
> Also use platform_get_resource, which is more usual and
> consistent with platform_get_irq called later.
>
> Signed-off-by: Fabien Dessenne <fabien.dessenne at st.com>
> Signed-off-by: Philippe CORNU <philippe.cornu at st.com>

Note that could be conflicting with Philippe Zabel work on reset

Reviewed-by: Benjamin Gaignard <benjamin.gaignard at linaro.org>
> ---
>  drivers/gpu/drm/stm/ltdc.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/stm/ltdc.c b/drivers/gpu/drm/stm/ltdc.c
> index 92e58ba..f4ed21a 100644
> --- a/drivers/gpu/drm/stm/ltdc.c
> +++ b/drivers/gpu/drm/stm/ltdc.c
> @@ -874,7 +874,7 @@ int ltdc_load(struct drm_device *ddev)
>         struct drm_panel *panel;
>         struct drm_crtc *crtc;
>         struct reset_control *rstc;
> -       struct resource res;
> +       struct resource *res;
>         int irq, ret, i;
>
>         DRM_DEBUG_DRIVER("\n");
> @@ -883,7 +883,7 @@ int ltdc_load(struct drm_device *ddev)
>         if (ret)
>                 return ret;
>
> -       rstc = of_reset_control_get(np, NULL);
> +       rstc = devm_reset_control_get(dev, NULL);
>
>         mutex_init(&ldev->err_lock);
>
> @@ -898,13 +898,14 @@ int ltdc_load(struct drm_device *ddev)
>                 return -ENODEV;
>         }
>
> -       if (of_address_to_resource(np, 0, &res)) {
> +       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> +       if (!res) {
>                 DRM_ERROR("Unable to get resource\n");
>                 ret = -ENODEV;
>                 goto err;
>         }
>
> -       ldev->regs = devm_ioremap_resource(dev, &res);
> +       ldev->regs = devm_ioremap_resource(dev, res);
>         if (IS_ERR(ldev->regs)) {
>                 DRM_ERROR("Unable to get ltdc registers\n");
>                 ret = PTR_ERR(ldev->regs);
> --
> 1.9.1
>



-- 
Benjamin Gaignard

Graphic Study Group

Linaro.org │ Open source software for ARM SoCs

Follow Linaro: Facebook | Twitter | Blog