Skip to content

Commit

Permalink
drm/imx: drop explicit drm_mode_config_cleanup
Browse files Browse the repository at this point in the history
Use drmm_mode_config_init() and drop the explicit calls to
drm_mode_config_cleanup().

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
pH5 committed Oct 26, 2020
1 parent 67149a4 commit a67d508
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/gpu/drm/imx/imx-drm-core.c
Expand Up @@ -20,6 +20,7 @@
#include <drm/drm_fb_helper.h>
#include <drm/drm_gem_cma_helper.h>
#include <drm/drm_gem_framebuffer_helper.h>
#include <drm/drm_managed.h>
#include <drm/drm_of.h>
#include <drm/drm_plane_helper.h>
#include <drm/drm_probe_helper.h>
Expand Down Expand Up @@ -212,7 +213,9 @@ static int imx_drm_bind(struct device *dev)
drm->mode_config.allow_fb_modifiers = true;
drm->mode_config.normalize_zpos = true;

drm_mode_config_init(drm);
ret = drmm_mode_config_init(drm);
if (ret)
return ret;

ret = drm_vblank_init(drm, MAX_CRTC);
if (ret)
Expand Down Expand Up @@ -251,7 +254,6 @@ static int imx_drm_bind(struct device *dev)
drm_kms_helper_poll_fini(drm);
component_unbind_all(drm->dev, drm);
err_kms:
drm_mode_config_cleanup(drm);
drm_dev_put(drm);

return ret;
Expand All @@ -267,11 +269,9 @@ static void imx_drm_unbind(struct device *dev)

component_unbind_all(drm->dev, drm);

drm_mode_config_cleanup(drm);
drm_dev_put(drm);

dev_set_drvdata(dev, NULL);

drm_dev_put(drm);
}

static const struct component_master_ops imx_drm_ops = {
Expand Down

0 comments on commit a67d508

Please sign in to comment.