mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
drm/pl111: Drop explicit drm_mode_config_cleanup call
It's right above the drm_dev_put(). 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(). Aside: This driver gets its devm_ stuff all wrong wrt drm_device and anything hanging off that. Not the only one unfortunately. v2: Explain why this cleanup is possible (Laurent). v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) Acked-by: Sam Ravnborg <sam@ravnborg.org> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Thomas Zimmermann <tzimmermann@suse.de> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: Eric Anholt <eric@anholt.net> Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-36-daniel.vetter@ffwll.ch
This commit is contained in:
parent
bd9ff7b521
commit
5e3e55b69c
1 changed files with 6 additions and 6 deletions
|
@ -90,10 +90,13 @@ static int pl111_modeset_init(struct drm_device *dev)
|
||||||
struct drm_panel *panel = NULL;
|
struct drm_panel *panel = NULL;
|
||||||
struct drm_bridge *bridge = NULL;
|
struct drm_bridge *bridge = NULL;
|
||||||
bool defer = false;
|
bool defer = false;
|
||||||
int ret = 0;
|
int ret;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
drm_mode_config_init(dev);
|
ret = drmm_mode_config_init(dev);
|
||||||
|
if (ret)
|
||||||
|
return ret;
|
||||||
|
|
||||||
mode_config = &dev->mode_config;
|
mode_config = &dev->mode_config;
|
||||||
mode_config->funcs = &mode_config_funcs;
|
mode_config->funcs = &mode_config_funcs;
|
||||||
mode_config->min_width = 1;
|
mode_config->min_width = 1;
|
||||||
|
@ -154,7 +157,7 @@ static int pl111_modeset_init(struct drm_device *dev)
|
||||||
DRM_MODE_CONNECTOR_Unknown);
|
DRM_MODE_CONNECTOR_Unknown);
|
||||||
if (IS_ERR(bridge)) {
|
if (IS_ERR(bridge)) {
|
||||||
ret = PTR_ERR(bridge);
|
ret = PTR_ERR(bridge);
|
||||||
goto out_config;
|
goto finish;
|
||||||
}
|
}
|
||||||
} else if (bridge) {
|
} else if (bridge) {
|
||||||
dev_info(dev->dev, "Using non-panel bridge\n");
|
dev_info(dev->dev, "Using non-panel bridge\n");
|
||||||
|
@ -197,8 +200,6 @@ static int pl111_modeset_init(struct drm_device *dev)
|
||||||
out_bridge:
|
out_bridge:
|
||||||
if (panel)
|
if (panel)
|
||||||
drm_panel_bridge_remove(bridge);
|
drm_panel_bridge_remove(bridge);
|
||||||
out_config:
|
|
||||||
drm_mode_config_cleanup(dev);
|
|
||||||
finish:
|
finish:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -343,7 +344,6 @@ static int pl111_amba_remove(struct amba_device *amba_dev)
|
||||||
drm_dev_unregister(drm);
|
drm_dev_unregister(drm);
|
||||||
if (priv->panel)
|
if (priv->panel)
|
||||||
drm_panel_bridge_remove(priv->bridge);
|
drm_panel_bridge_remove(priv->bridge);
|
||||||
drm_mode_config_cleanup(drm);
|
|
||||||
drm_dev_put(drm);
|
drm_dev_put(drm);
|
||||||
of_reserved_mem_device_release(dev);
|
of_reserved_mem_device_release(dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue