aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/dss/hdmi5.c
diff options
context:
space:
mode:
authorLaurent Pinchart <[email protected]>2018-03-06 23:34:53 +0200
committerTomi Valkeinen <[email protected]>2018-09-03 16:13:28 +0300
commit43f7078f6b6f8fed8edfbbdeff83e276306e5e6e (patch)
tree730f5b2a47aed9665139be803d8d880d954d8a0e /drivers/gpu/drm/omapdrm/dss/hdmi5.c
parent0f37938c7c432c7737d85940475bcbd3c362447e (diff)
drm/omap: dss: Remove the dss_mgr_(dis)connect() operations
The dss_mgr .connect() and .disconnect() are implemented as no-op in omapdrm. The operations are unneeded, remove them. Signed-off-by: Laurent Pinchart <[email protected]> Reviewed-by: Sebastian Reichel <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/dss/hdmi5.c')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/hdmi5.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index d5860438ddd9..889c31745492 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -438,15 +438,9 @@ static int hdmi_connect(struct omap_dss_device *src,
{
int r;
- r = dss_mgr_connect(dst);
- if (r)
- return r;
-
r = omapdss_device_connect(dst->dss, dst, dst->next);
- if (r) {
- dss_mgr_disconnect(dst);
+ if (r)
return r;
- }
dst->dispc_channel_connected = true;
return 0;
@@ -458,8 +452,6 @@ static void hdmi_disconnect(struct omap_dss_device *src,
dst->dispc_channel_connected = false;
omapdss_device_disconnect(dst, dst->next);
-
- dss_mgr_disconnect(dst);
}
static int hdmi_read_edid(struct omap_dss_device *dssdev,