From: Tomi Valkeinen Date: Thu, 5 Nov 2015 08:02:43 +0000 (+0200) Subject: drm/omap: remove last uses of omap_overlay_manager X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=751d2e18b0859ec3edc1c61bfcc09affdbd9b323;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git drm/omap: remove last uses of omap_overlay_manager We have now removed all uses of 'struct omap_overlay_manager', so we can now remove the last places where it is set. Signed-off-by: Tomi Valkeinen --- diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 3667ff1d8474..263f4b7a5789 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -102,8 +102,6 @@ static struct omap_dss_device *omap_crtc_output[8]; static int omap_crtc_dss_connect(enum omap_channel channel, struct omap_dss_device *dst) { - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); - if (omap_crtc_output[channel]) return -EINVAL; @@ -113,22 +111,14 @@ static int omap_crtc_dss_connect(enum omap_channel channel, omap_crtc_output[channel] = dst; dst->dispc_channel_connected = true; - dst->manager = mgr; - mgr->output = dst; - return 0; } static void omap_crtc_dss_disconnect(enum omap_channel channel, struct omap_dss_device *dst) { - struct omap_overlay_manager *mgr = omap_dss_get_overlay_manager(channel); - omap_crtc_output[channel] = NULL; dst->dispc_channel_connected = false; - - mgr->output->manager = NULL; - mgr->output = NULL; } static void omap_crtc_dss_start_update(enum omap_channel channel)