Hi, On Tue, Dec 08, 2020 at 02:28:49PM +0200, Tomi Valkeinen wrote: > The function names have evolved to be very confusing, and bunch of them > have "display" in them even if the function doesn't deal with display as > such (e.g. dsi_display_enable which just enables the DSI interface). > Rename them by dropping the "display". > > Signed-off-by: Tomi Valkeinen <tomi.valkei...@ti.com> > Reviewed-by: Laurent Pinchart <laurent.pinch...@ideasonboard.com> > ---
Reviewed-by: Sebastian Reichel <sebastian.reic...@collabora.com>
-- Sebastian
> drivers/gpu/drm/omapdrm/dss/dsi.c | 36 +++++++++++++++----------------
> 1 file changed, 18 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c
> b/drivers/gpu/drm/omapdrm/dss/dsi.c
> index d83346812810..d9c2cd849328 100644
> --- a/drivers/gpu/drm/omapdrm/dss/dsi.c
> +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
> @@ -55,8 +55,8 @@
>
> static void dsi_set_ulps_auto(struct dsi_data *dsi, bool enable);
>
> -static int dsi_display_init_dispc(struct dsi_data *dsi);
> -static void dsi_display_uninit_dispc(struct dsi_data *dsi);
> +static int dsi_init_dispc(struct dsi_data *dsi);
> +static void dsi_uninit_dispc(struct dsi_data *dsi);
>
> static int dsi_vc_send_null(struct dsi_data *dsi, int vc, int channel);
>
> @@ -3257,7 +3257,7 @@ static void dsi_enable_video_output(struct
> omap_dss_device *dssdev, int vc)
> u16 word_count;
> int r;
>
> - r = dsi_display_init_dispc(dsi);
> + r = dsi_init_dispc(dsi);
> if (r) {
> dev_err(dsi->dev, "failed to init dispc!\n");
> return;
> @@ -3309,7 +3309,7 @@ static void dsi_enable_video_output(struct
> omap_dss_device *dssdev, int vc)
> dsi_vc_enable(dsi, vc, false);
> }
> err_pix_fmt:
> - dsi_display_uninit_dispc(dsi);
> + dsi_uninit_dispc(dsi);
> dev_err(dsi->dev, "failed to enable DSI encoder!\n");
> return;
> }
> @@ -3331,7 +3331,7 @@ static void dsi_disable_video_output(struct
> omap_dss_device *dssdev, int vc)
>
> dss_mgr_disable(&dsi->output);
>
> - dsi_display_uninit_dispc(dsi);
> + dsi_uninit_dispc(dsi);
> }
>
> static void dsi_update_screen_dispc(struct dsi_data *dsi)
> @@ -3582,7 +3582,7 @@ static int dsi_configure_dispc_clocks(struct dsi_data
> *dsi)
> return 0;
> }
>
> -static int dsi_display_init_dispc(struct dsi_data *dsi)
> +static int dsi_init_dispc(struct dsi_data *dsi)
> {
> enum omap_channel dispc_channel = dsi->output.dispc_channel;
> int r;
> @@ -3627,7 +3627,7 @@ static int dsi_display_init_dispc(struct dsi_data *dsi)
> return r;
> }
>
> -static void dsi_display_uninit_dispc(struct dsi_data *dsi)
> +static void dsi_uninit_dispc(struct dsi_data *dsi)
> {
> enum omap_channel dispc_channel = dsi->output.dispc_channel;
>
> @@ -3654,7 +3654,7 @@ static int dsi_configure_dsi_clocks(struct dsi_data
> *dsi)
> return 0;
> }
>
> -static int dsi_display_init_dsi(struct dsi_data *dsi)
> +static int dsi_init_dsi(struct dsi_data *dsi)
> {
> int r;
>
> @@ -3718,7 +3718,7 @@ static int dsi_display_init_dsi(struct dsi_data *dsi)
> return r;
> }
>
> -static void dsi_display_uninit_dsi(struct dsi_data *dsi, bool
> disconnect_lanes,
> +static void dsi_uninit_dsi(struct dsi_data *dsi, bool disconnect_lanes,
> bool enter_ulps)
> {
> if (enter_ulps && !dsi->ulps_enabled)
> @@ -3741,7 +3741,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_enable(struct dsi_data *dsi)
> {
> int r;
>
> @@ -3755,7 +3755,7 @@ static void dsi_display_enable(struct dsi_data *dsi)
>
> _dsi_initialize_irq(dsi);
>
> - r = dsi_display_init_dsi(dsi);
> + r = dsi_init_dsi(dsi);
> if (r)
> goto err_init_dsi;
>
> @@ -3767,10 +3767,10 @@ static void dsi_display_enable(struct dsi_data *dsi)
> dsi_runtime_put(dsi);
> err_get_dsi:
> mutex_unlock(&dsi->lock);
> - DSSDBG("dsi_display_ulps_enable FAILED\n");
> + DSSDBG("dsi_enable FAILED\n");
> }
>
> -static void dsi_display_disable(struct dsi_data *dsi,
> +static void dsi_disable(struct dsi_data *dsi,
> bool disconnect_lanes, bool enter_ulps)
> {
> WARN_ON(!dsi_bus_is_locked(dsi));
> @@ -3782,7 +3782,7 @@ static void dsi_display_disable(struct dsi_data *dsi,
> dsi_sync_vc(dsi, 2);
> dsi_sync_vc(dsi, 3);
>
> - dsi_display_uninit_dsi(dsi, disconnect_lanes, enter_ulps);
> + dsi_uninit_dsi(dsi, disconnect_lanes, enter_ulps);
>
> dsi_runtime_put(dsi);
>
> @@ -3812,7 +3812,7 @@ static void omap_dsi_ulps_work_callback(struct
> work_struct *work)
>
> dsi_enable_te(dsi, false);
>
> - dsi_display_disable(dsi, false, true);
> + dsi_disable(dsi, false, true);
>
> dsi_bus_unlock(dsi);
> }
> @@ -3833,7 +3833,7 @@ static void dsi_set_ulps_auto(struct dsi_data *dsi,
> bool enable)
> return;
>
> dsi_bus_lock(dsi);
> - dsi_display_enable(dsi);
> + dsi_enable(dsi);
> dsi_enable_te(dsi, true);
> dsi_bus_unlock(dsi);
> }
> @@ -4924,7 +4924,7 @@ static void dsi_bridge_enable(struct drm_bridge *bridge)
>
> dsi_bus_lock(dsi);
>
> - dsi_display_enable(dsi);
> + dsi_enable(dsi);
>
> dsi_enable_video_output(dssdev, VC_VIDEO);
>
> @@ -4946,7 +4946,7 @@ static void dsi_bridge_disable(struct drm_bridge
> *bridge)
>
> dsi_disable_video_output(dssdev, VC_VIDEO);
>
> - dsi_display_disable(dsi, true, false);
> + dsi_disable(dsi, true, false);
>
> dsi_bus_unlock(dsi);
> }
> --
> Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki.
> Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
>
signature.asc
Description: PGP signature
_______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
