summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2020-12-15 12:46:49 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2020-12-15 16:17:32 +0200
commit1f0560537963b23420d5a5c0e4e9bfc8c4d9f55a (patch)
treebc2a3c29766402460da247ce3678851c77b04eb7 /drivers/gpu/drm/omapdrm
parent5d676b6f27b44210ea69dbdf7d859cf2310d577e (diff)
drm/omap: dsi: display_enable cleanup
We can drop dsi_display_enable(), which just calls _dsi_display_enable(), and rename _dsi_display_enable() to dsi_display_enable(). The WARN_ON(!dsi_bus_is_locked(dsi)) in dsi_display_enable is extra and can be dropped, as _dsi_display_enable() has the same WARN_ON(). Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Link: https://patchwork.freedesktop.org/patch/msgid/20201215104657.802264-77-tomi.valkeinen@ti.com
Diffstat (limited to 'drivers/gpu/drm/omapdrm')
-rw-r--r--drivers/gpu/drm/omapdrm/dss/dsi.c16
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c
index 320342385172..8ae2f265ada0 100644
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -3740,7 +3740,7 @@ static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes,
}
}
-static void _dsi_display_enable(struct dsi_data *dsi)
+static void dsi_display_enable(struct dsi_data *dsi)
{
int r;
@@ -3769,16 +3769,6 @@ err_get_dsi:
DSSDBG("dsi_display_ulps_enable FAILED\n");
}
-static void dsi_display_enable(struct omap_dss_device *dssdev)
-{
- struct dsi_data *dsi = to_dsi_data(dssdev);
- DSSDBG("dsi_display_enable\n");
-
- WARN_ON(!dsi_bus_is_locked(dsi));
-
- _dsi_display_enable(dsi);
-}
-
static void _dsi_display_disable(struct dsi_data *dsi,
bool disconnect_lanes, bool enter_ulps)
{
@@ -3853,7 +3843,7 @@ static void dsi_set_ulps_auto(struct dsi_data *dsi, bool enable)
return;
dsi_bus_lock(dsi);
- _dsi_display_enable(dsi);
+ dsi_display_enable(dsi);
dsi_enable_te(dsi, true);
dsi_bus_unlock(dsi);
}
@@ -4944,7 +4934,7 @@ static void dsi_bridge_enable(struct drm_bridge *bridge)
dsi_bus_lock(dsi);
- dsi_display_enable(dssdev);
+ dsi_display_enable(dsi);
dsi_enable_video_output(dssdev, VC_VIDEO);