On Mon, Mar 02, 2020 at 11:26:12PM +0100, Daniel Vetter wrote:
> Allows us to drop the drm_driver.release callback.
>
> This is made possible by a preceeding patch which added a drmm_
> cleanup action to drm_mode_config_init(), hence all we need to do to
> ensure that drm_mode_config_cleanup() is run on final drm_device
> cleanup is check the new error code for _init().
>
> v2: Explain why this cleanup is possible (Laurent).
>
> v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas)
>
> Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
> Cc: Thomas Zimmermann <tzimmermann@xxxxxxx>
> Reviewed-by: Linus Walleij <linus.walleij@xxxxxxxxxx> (v2)
> Cc: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxxx>
> Cc: Linus Walleij <linus.walleij@xxxxxxxxxx>
Acked-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/mcde/mcde_drv.c | 22 ++++++----------------
> 1 file changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c
> index a543ebf3d541..03d2e1a00810 100644
> --- a/drivers/gpu/drm/mcde/mcde_drv.c
> +++ b/drivers/gpu/drm/mcde/mcde_drv.c
> @@ -184,13 +184,13 @@ static int mcde_modeset_init(struct drm_device *drm)
> ret = drm_vblank_init(drm, 1);
> if (ret) {
> dev_err(drm->dev, "failed to init vblank\n");
> - goto out_config;
> + return ret;
> }
>
> ret = mcde_display_init(drm);
> if (ret) {
> dev_err(drm->dev, "failed to init display\n");
> - goto out_config;
> + return ret;
> }
>
> /*
> @@ -204,7 +204,7 @@ static int mcde_modeset_init(struct drm_device *drm)
> mcde->bridge);
> if (ret) {
> dev_err(drm->dev, "failed to attach display output bridge\n");
> - goto out_config;
> + return ret;
> }
>
> drm_mode_config_reset(drm);
> @@ -212,17 +212,6 @@ static int mcde_modeset_init(struct drm_device *drm)
> drm_fbdev_generic_setup(drm, 32);
>
> return 0;
> -
> -out_config:
> - drm_mode_config_cleanup(drm);
> - return ret;
> -}
> -
> -static void mcde_release(struct drm_device *drm)
> -{
> - struct mcde *mcde = drm->dev_private;
> -
> - drm_mode_config_cleanup(drm);
> }
>
> DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
> @@ -230,7 +219,6 @@ DEFINE_DRM_GEM_CMA_FOPS(drm_fops);
> static struct drm_driver mcde_drm_driver = {
> .driver_features =
> DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
> - .release = mcde_release,
> .lastclose = drm_fb_helper_lastclose,
> .ioctls = NULL,
> .fops = &drm_fops,
> @@ -258,7 +246,9 @@ static int mcde_drm_bind(struct device *dev)
> struct drm_device *drm = dev_get_drvdata(dev);
> int ret;
>
> - drm_mode_config_init(drm);
> + ret = drmm_mode_config_init(drm);
> + if (ret)
> + return ret;
>
> ret = component_bind_all(drm->dev, drm);
> if (ret) {
> --
> 2.24.1
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
