diff options
author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-02-28 18:30:30 +0300 |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:26 +0300 |
commit | 1f507968c30b0e86a307164a212ef11def1e5899 (patch) | |
tree | 3dc492e1081969be597f09f7457ab41bb642f4d9 /drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | |
parent | ec727e3f61845d6d64b3c5eba464096d6cc7f8e9 (diff) | |
download | linux-1f507968c30b0e86a307164a212ef11def1e5899.tar.xz |
drm/omap: dss: Move debug message and checks to connection handlers
The connectors, encoders and display duplicate the same debug messages
and connection checks in their omap_dss_device connect and disconnect
handlers. Move the code to the connect and disconnect wrappers.
To simplify the code the connect function returns -EBUSY unconditionally
if the device is already connected. This doesn't cause any change in
practice: the connect handler of displays is never called on a connected
device as it is only invoked during omapdrm initialization.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c')
-rw-r--r-- | drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c index 41ba3c5dbe7d..d77e21fc26ad 100644 --- a/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c +++ b/drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c @@ -48,11 +48,6 @@ static int tvc_connect(struct omap_dss_device *dssdev) struct omap_dss_device *in; int r; - dev_dbg(ddata->dev, "connect\n"); - - if (omapdss_device_is_connected(dssdev)) - return 0; - in = omapdss_of_find_source_for_first_ep(ddata->dev->of_node); if (IS_ERR(in)) { dev_err(ddata->dev, "failed to find video source\n"); @@ -74,11 +69,6 @@ static void tvc_disconnect(struct omap_dss_device *dssdev) struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; - dev_dbg(ddata->dev, "disconnect\n"); - - if (!omapdss_device_is_connected(dssdev)) - return; - omapdss_device_disconnect(in, dssdev); omap_dss_put_device(in); |