drm/omap: dsi: display_disable cleanup
We can drop dsi_display_disable() which just calls _dsi_display_disable(), and rename _dsi_display_disable() to dsi_display_disable(). The WARN_ON(!dsi_bus_is_locked(dsi)) in dsi_display_disable is extra and can be dropped, as _dsi_display_disable() 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-78-tomi.valkeinen@ti.com
This commit is contained in:
parent
1f05605379
commit
ead05b53a9
@ -63,8 +63,6 @@ static int dsi_vc_send_null(struct dsi_data *dsi, int vc, int channel);
|
||||
static ssize_t _omap_dsi_host_transfer(struct dsi_data *dsi, int vc,
|
||||
const struct mipi_dsi_msg *msg);
|
||||
|
||||
static void dsi_display_disable(struct omap_dss_device *dssdev);
|
||||
|
||||
#ifdef DSI_PERF_MEASURE
|
||||
static bool dsi_perf;
|
||||
module_param(dsi_perf, bool, 0644);
|
||||
@ -3769,7 +3767,7 @@ err_get_dsi:
|
||||
DSSDBG("dsi_display_ulps_enable FAILED\n");
|
||||
}
|
||||
|
||||
static void _dsi_display_disable(struct dsi_data *dsi,
|
||||
static void dsi_display_disable(struct dsi_data *dsi,
|
||||
bool disconnect_lanes, bool enter_ulps)
|
||||
{
|
||||
WARN_ON(!dsi_bus_is_locked(dsi));
|
||||
@ -3788,17 +3786,6 @@ static void _dsi_display_disable(struct dsi_data *dsi,
|
||||
mutex_unlock(&dsi->lock);
|
||||
}
|
||||
|
||||
static void dsi_display_disable(struct omap_dss_device *dssdev)
|
||||
{
|
||||
struct dsi_data *dsi = to_dsi_data(dssdev);
|
||||
|
||||
WARN_ON(!dsi_bus_is_locked(dsi));
|
||||
|
||||
DSSDBG("dsi_display_disable\n");
|
||||
|
||||
_dsi_display_disable(dsi, true, false);
|
||||
}
|
||||
|
||||
static int dsi_enable_te(struct dsi_data *dsi, bool enable)
|
||||
{
|
||||
dsi->te_enabled = enable;
|
||||
@ -3822,7 +3809,7 @@ static void omap_dsi_ulps_work_callback(struct work_struct *work)
|
||||
|
||||
dsi_enable_te(dsi, false);
|
||||
|
||||
_dsi_display_disable(dsi, false, true);
|
||||
dsi_display_disable(dsi, false, true);
|
||||
|
||||
dsi_bus_unlock(dsi);
|
||||
}
|
||||
@ -4956,7 +4943,7 @@ static void dsi_bridge_disable(struct drm_bridge *bridge)
|
||||
|
||||
dsi_disable_video_output(dssdev, VC_VIDEO);
|
||||
|
||||
dsi_display_disable(dssdev);
|
||||
dsi_display_disable(dsi, true, false);
|
||||
|
||||
dsi_bus_unlock(dsi);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user