drm/msm/dsi: Minor whitespace and style cleanup
Cleanup few obvious kernel coding style violations: missing or unnecessary braces in 'if-else', unnecessary break lines, incorrect breaking of long function declarations, unnecessary 'else' after a 'return'. No functional impact expected. Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Patchwork: https://patchwork.freedesktop.org/patch/637305/ Link: https://lore.kernel.org/r/20250214-drm-msm-cleanups-v2-3-1bec50f37dc1@linaro.org Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
committed by
Dmitry Baryshkov
parent
d5bc3c3389
commit
cce156257e
@@ -179,18 +179,18 @@ struct msm_dsi_host {
|
||||
int irq;
|
||||
};
|
||||
|
||||
|
||||
static inline u32 dsi_read(struct msm_dsi_host *msm_host, u32 reg)
|
||||
{
|
||||
return readl(msm_host->ctrl_base + reg);
|
||||
}
|
||||
|
||||
static inline void dsi_write(struct msm_dsi_host *msm_host, u32 reg, u32 data)
|
||||
{
|
||||
writel(data, msm_host->ctrl_base + reg);
|
||||
}
|
||||
|
||||
static const struct msm_dsi_cfg_handler *dsi_get_config(
|
||||
struct msm_dsi_host *msm_host)
|
||||
static const struct msm_dsi_cfg_handler *
|
||||
dsi_get_config(struct msm_dsi_host *msm_host)
|
||||
{
|
||||
const struct msm_dsi_cfg_handler *cfg_hnd = NULL;
|
||||
struct device *dev = &msm_host->pdev->dev;
|
||||
@@ -370,7 +370,6 @@ int dsi_link_clk_set_rate_6g(struct msm_dsi_host *msm_host)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
int dsi_link_clk_enable_6g(struct msm_dsi_host *msm_host)
|
||||
{
|
||||
int ret;
|
||||
@@ -588,7 +587,6 @@ static void dsi_calc_pclk(struct msm_dsi_host *msm_host, bool is_bonded_dsi)
|
||||
|
||||
DBG("pclk=%lu, bclk=%lu", msm_host->pixel_clk_rate,
|
||||
msm_host->byte_clk_rate);
|
||||
|
||||
}
|
||||
|
||||
int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host, bool is_bonded_dsi)
|
||||
@@ -677,8 +675,8 @@ static inline enum dsi_traffic_mode dsi_get_traffic_mode(const u32 mode_flags)
|
||||
return NON_BURST_SYNCH_EVENT;
|
||||
}
|
||||
|
||||
static inline enum dsi_vid_dst_format dsi_get_vid_fmt(
|
||||
const enum mipi_dsi_pixel_format mipi_fmt)
|
||||
static inline enum dsi_vid_dst_format
|
||||
dsi_get_vid_fmt(const enum mipi_dsi_pixel_format mipi_fmt)
|
||||
{
|
||||
switch (mipi_fmt) {
|
||||
case MIPI_DSI_FMT_RGB888: return VID_DST_FORMAT_RGB888;
|
||||
@@ -689,8 +687,8 @@ static inline enum dsi_vid_dst_format dsi_get_vid_fmt(
|
||||
}
|
||||
}
|
||||
|
||||
static inline enum dsi_cmd_dst_format dsi_get_cmd_fmt(
|
||||
const enum mipi_dsi_pixel_format mipi_fmt)
|
||||
static inline enum dsi_cmd_dst_format
|
||||
dsi_get_cmd_fmt(const enum mipi_dsi_pixel_format mipi_fmt)
|
||||
{
|
||||
switch (mipi_fmt) {
|
||||
case MIPI_DSI_FMT_RGB888: return CMD_DST_FORMAT_RGB888;
|
||||
@@ -1282,14 +1280,15 @@ static int dsi_cmd_dma_add(struct msm_dsi_host *msm_host,
|
||||
static int dsi_short_read1_resp(u8 *buf, const struct mipi_dsi_msg *msg)
|
||||
{
|
||||
u8 *data = msg->rx_buf;
|
||||
|
||||
if (data && (msg->rx_len >= 1)) {
|
||||
*data = buf[1]; /* strip out dcs type */
|
||||
return 1;
|
||||
} else {
|
||||
pr_err("%s: read data does not match with rx_buf len %zu\n",
|
||||
__func__, msg->rx_len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pr_err("%s: read data does not match with rx_buf len %zu\n",
|
||||
__func__, msg->rx_len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1298,15 +1297,16 @@ static int dsi_short_read1_resp(u8 *buf, const struct mipi_dsi_msg *msg)
|
||||
static int dsi_short_read2_resp(u8 *buf, const struct mipi_dsi_msg *msg)
|
||||
{
|
||||
u8 *data = msg->rx_buf;
|
||||
|
||||
if (data && (msg->rx_len >= 2)) {
|
||||
data[0] = buf[1]; /* strip out dcs type */
|
||||
data[1] = buf[2];
|
||||
return 2;
|
||||
} else {
|
||||
pr_err("%s: read data does not match with rx_buf len %zu\n",
|
||||
__func__, msg->rx_len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
pr_err("%s: read data does not match with rx_buf len %zu\n",
|
||||
__func__, msg->rx_len);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int dsi_long_read_resp(u8 *buf, const struct mipi_dsi_msg *msg)
|
||||
@@ -1366,8 +1366,9 @@ static int dsi_cmd_dma_tx(struct msm_dsi_host *msm_host, int len)
|
||||
ret = -ETIMEDOUT;
|
||||
else
|
||||
ret = len;
|
||||
} else
|
||||
} else {
|
||||
ret = len;
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -1435,11 +1436,12 @@ static int dsi_cmds2buf_tx(struct msm_dsi_host *msm_host,
|
||||
return len;
|
||||
}
|
||||
|
||||
/* for video mode, do not send cmds more than
|
||||
* one pixel line, since it only transmit it
|
||||
* during BLLP.
|
||||
*/
|
||||
/* TODO: if the command is sent in LP mode, the bit rate is only
|
||||
/*
|
||||
* for video mode, do not send cmds more than
|
||||
* one pixel line, since it only transmit it
|
||||
* during BLLP.
|
||||
*
|
||||
* TODO: if the command is sent in LP mode, the bit rate is only
|
||||
* half of esc clk rate. In this case, if the video is already
|
||||
* actively streaming, we need to check more carefully if the
|
||||
* command can be fit into one BLLP.
|
||||
@@ -1864,9 +1866,8 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)
|
||||
int ret;
|
||||
|
||||
msm_host = devm_kzalloc(&pdev->dev, sizeof(*msm_host), GFP_KERNEL);
|
||||
if (!msm_host) {
|
||||
if (!msm_host)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
msm_host->pdev = pdev;
|
||||
msm_dsi->host = &msm_host->base;
|
||||
|
||||
Reference in New Issue
Block a user