From a48bc6ac2c6cd85bc079fc859ab14ea844e812cd Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 4 Mar 2018 23:55:56 +0200 Subject: drm/omap: dss: Remove duplicated parameter to dss_mgr_(dis)connect() The dss_mgr_connect() and dss_mgr_disconnect() functions take two omap_dss_device pointers as parameters, which are always set to the same value by all callers. Remove the duplicated pointer. Signed-off-by: Laurent Pinchart Reviewed-by: Sebastian Reichel Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/dss/venc.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/dss/venc.c') diff --git a/drivers/gpu/drm/omapdrm/dss/venc.c b/drivers/gpu/drm/omapdrm/dss/venc.c index 298e86cc9e14..24a2b9a41864 100644 --- a/drivers/gpu/drm/omapdrm/dss/venc.c +++ b/drivers/gpu/drm/omapdrm/dss/venc.c @@ -720,7 +720,7 @@ static int venc_connect(struct omap_dss_device *dssdev, if (r) return r; - r = dss_mgr_connect(&venc->output, dssdev); + r = dss_mgr_connect(dssdev); if (r) return r; @@ -728,7 +728,7 @@ static int venc_connect(struct omap_dss_device *dssdev, if (r) { DSSERR("failed to connect output to new device: %s\n", dst->name); - dss_mgr_disconnect(&venc->output, dssdev); + dss_mgr_disconnect(dssdev); return r; } @@ -738,11 +738,9 @@ static int venc_connect(struct omap_dss_device *dssdev, static void venc_disconnect(struct omap_dss_device *dssdev, struct omap_dss_device *dst) { - struct venc_device *venc = dssdev_to_venc(dssdev); - omapdss_output_unset_device(dssdev); - dss_mgr_disconnect(&venc->output, dssdev); + dss_mgr_disconnect(dssdev); } static const struct omap_dss_device_ops venc_ops = { -- cgit v1.2.3