| Message ID | 20201208122855.254819-22-tomi.valkeinen@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Convert DSI code to use drm_mipi_dsi and drm_panel (second half) | expand |
Hi, On Tue, Dec 08, 2020 at 02:28:47PM +0200, Tomi Valkeinen wrote: > 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> -- Sebastian > drivers/gpu/drm/omapdrm/dss/dsi.c | 16 +++------------- > 1 file changed, 3 insertions(+), 13 deletions(-) > > diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c > index 44b8e42b52ec..961b991f6498 100644 > --- a/drivers/gpu/drm/omapdrm/dss/dsi.c > +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c > @@ -3743,7 +3743,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; > > @@ -3772,16 +3772,6 @@ static void _dsi_display_enable(struct dsi_data *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) > { > @@ -3856,7 +3846,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); > } > @@ -4947,7 +4937,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); > > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki >
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 44b8e42b52ec..961b991f6498 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c @@ -3743,7 +3743,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; @@ -3772,16 +3772,6 @@ static void _dsi_display_enable(struct dsi_data *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) { @@ -3856,7 +3846,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); } @@ -4947,7 +4937,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);