From b93109d7dc9e15649e1cf18281f02d8b4a102584 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 28 Feb 2018 15:58:13 +0200 Subject: drm/omap: dss: Move common device operations to common structure The various types of omapdss_*_ops structures define multiple operations that are not specific to a bus type. To simplify the code and remove dependencies on specific bus types move those operations to a common structure. Operations that are specific to a bus type are kept in the specialized ops structures. Signed-off-by: Laurent Pinchart Reviewed-by: Sebastian Reichel Signed-off-by: Tomi Valkeinen --- drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c') diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c index 6b640ede6614..a94868d9398b 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c @@ -59,7 +59,7 @@ static int tvc_connect(struct omap_dss_device *dssdev) return PTR_ERR(in); } - r = in->ops.atv->connect(in, dssdev); + r = in->ops->connect(in, dssdev); if (r) { omap_dss_put_device(in); return r; @@ -79,7 +79,7 @@ static void tvc_disconnect(struct omap_dss_device *dssdev) if (!omapdss_device_is_connected(dssdev)) return; - in->ops.atv->disconnect(in, dssdev); + in->ops->disconnect(in, dssdev); omap_dss_put_device(in); ddata->in = NULL; @@ -99,9 +99,9 @@ static int tvc_enable(struct omap_dss_device *dssdev) if (omapdss_device_is_enabled(dssdev)) return 0; - in->ops.atv->set_timings(in, &ddata->vm); + in->ops->set_timings(in, &ddata->vm); - r = in->ops.atv->enable(in); + r = in->ops->enable(in); if (r) return r; @@ -120,7 +120,7 @@ static void tvc_disable(struct omap_dss_device *dssdev) if (!omapdss_device_is_enabled(dssdev)) return; - in->ops.atv->disable(in); + in->ops->disable(in); dssdev->state = OMAP_DSS_DISPLAY_DISABLED; } @@ -133,7 +133,7 @@ static void tvc_set_timings(struct omap_dss_device *dssdev, ddata->vm = *vm; - in->ops.atv->set_timings(in, vm); + in->ops->set_timings(in, vm); } static void tvc_get_timings(struct omap_dss_device *dssdev, @@ -150,7 +150,7 @@ static int tvc_check_timings(struct omap_dss_device *dssdev, struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; - return in->ops.atv->check_timings(in, vm); + return in->ops->check_timings(in, vm); } static const struct omap_dss_driver tvc_driver = { -- cgit v1.2.3