From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: Tue, 13 Feb 2018 14:00:37 +0200
Subject: drm: omapdrm: dsi: Don't pass channel to dispc init/uninit functions
Git-commit: f81b0fd4701c6c25481a81f8ec279ddb9fa2c27a
Patch-mainline: v4.17-rc1
References: FATE#326289 FATE#326079 FATE#326049 FATE#322398 FATE#326166
The dsi_display_init_dispc() and dsi_display_uninit_dispc() functions
take a channel argument that is reduntant as it is always identical to
the dsi->output.dispc_channel. Remove the argument and use the field
directly in the functions to avoid misuse.
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
drivers/gpu/drm/omapdrm/dss/dsi.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
--- a/drivers/gpu/drm/omapdrm/dss/dsi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -215,10 +215,8 @@ struct dsi_reg { u16 module; u16 idx; };
typedef void (*omap_dsi_isr_t) (void *arg, u32 mask);
struct dsi_data;
-static int dsi_display_init_dispc(struct dsi_data *dsi,
- enum omap_channel channel);
-static void dsi_display_uninit_dispc(struct dsi_data *dsi,
- enum omap_channel channel);
+static int dsi_display_init_dispc(struct dsi_data *dsi);
+static void dsi_display_uninit_dispc(struct dsi_data *dsi);
static int dsi_vc_send_null(struct dsi_data *dsi, int channel);
@@ -3845,7 +3843,7 @@ static int dsi_enable_video_output(struc
return -ENODEV;
}
- r = dsi_display_init_dispc(dsi, dispc_channel);
+ r = dsi_display_init_dispc(dsi);
if (r)
goto err_init_dispc;
@@ -3895,7 +3893,7 @@ err_mgr_enable:
dsi_vc_enable(dsi, channel, false);
}
err_pix_fmt:
- dsi_display_uninit_dispc(dsi, dispc_channel);
+ dsi_display_uninit_dispc(dsi);
err_init_dispc:
return r;
}
@@ -3918,7 +3916,7 @@ static void dsi_disable_video_output(str
dss_mgr_disable(dispc_channel);
- dsi_display_uninit_dispc(dsi, dispc_channel);
+ dsi_display_uninit_dispc(dsi);
}
static void dsi_update_screen_dispc(struct dsi_data *dsi)
@@ -4104,9 +4102,9 @@ static int dsi_configure_dispc_clocks(st
return 0;
}
-static int dsi_display_init_dispc(struct dsi_data *dsi,
- enum omap_channel channel)
+static int dsi_display_init_dispc(struct dsi_data *dsi)
{
+ enum omap_channel channel = dsi->output.dispc_channel;
int r;
dss_select_lcd_clk_source(dsi->dss, channel, dsi->module_id == 0 ?
@@ -4167,9 +4165,10 @@ err:
return r;
}
-static void dsi_display_uninit_dispc(struct dsi_data *dsi,
- enum omap_channel channel)
+static void dsi_display_uninit_dispc(struct dsi_data *dsi)
{
+ enum omap_channel channel = dsi->output.dispc_channel;
+
if (dsi->mode == OMAP_DSS_DSI_CMD_MODE)
dss_mgr_unregister_framedone_handler(channel,
dsi_framedone_irq_callback, dsi);