diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2018-02-28 17:30:30 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2018-09-03 16:13:26 +0300 |
| commit | 1f507968c30b0e86a307164a212ef11def1e5899 (patch) | |
| tree | 3dc492e1081969be597f09f7457ab41bb642f4d9 /drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | |
| parent | ec727e3f61845d6d64b3c5eba464096d6cc7f8e9 (diff) | |
| download | linux-1f507968c30b0e86a307164a212ef11def1e5899.tar.bz2 | |
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/encoder-opa362.c')
| -rw-r--r-- | drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c index 752b565987c1..5b9ef09e6b2d 100644 --- a/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c +++ b/drivers/gpu/drm/omapdrm/displays/encoder-opa362.c @@ -39,11 +39,6 @@ static int opa362_connect(struct omap_dss_device *dssdev, struct omap_dss_device *in; int r; - dev_dbg(dssdev->dev, "connect\n"); - - if (omapdss_device_is_connected(dssdev)) - return -EBUSY; - in = omapdss_of_find_source_for_first_ep(dssdev->dev->of_node); if (IS_ERR(in)) { dev_err(dssdev->dev, "failed to find video source\n"); @@ -69,12 +64,6 @@ static void opa362_disconnect(struct omap_dss_device *dssdev, struct panel_drv_data *ddata = to_panel_data(dssdev); struct omap_dss_device *in = ddata->in; - dev_dbg(dssdev->dev, "disconnect\n"); - - WARN_ON(!omapdss_device_is_connected(dssdev)); - if (!omapdss_device_is_connected(dssdev)) - return; - WARN_ON(dst != dssdev->dst); if (dst != dssdev->dst) return; |