diff --git a/drivers/video/fbdev/starfive/starfive_comm_regs.h b/drivers/video/fbdev/starfive/starfive_comm_regs.h index 91d2040282d6..24cb5af2cc41 100644 --- a/drivers/video/fbdev/starfive/starfive_comm_regs.h +++ b/drivers/video/fbdev/starfive/starfive_comm_regs.h @@ -69,7 +69,7 @@ #define BIT_RST_DSI_DPI_PIX 17 -static u32 sf_fb_cfgread32(struct sf_fb_data *sf_dev, u32 reg) +static inline u32 sf_fb_cfgread32(struct sf_fb_data *sf_dev, u32 reg) { return ioread32(sf_dev->base_syscfg + reg); } @@ -84,7 +84,7 @@ static inline u32 sf_fb_rstread32(struct sf_fb_data *sf_dev, u32 reg) return ioread32(sf_dev->base_rst + reg); } -static void sf_fb_rstwrite32(struct sf_fb_data *sf_dev, u32 reg, u32 val) +static inline void sf_fb_rstwrite32(struct sf_fb_data *sf_dev, u32 reg, u32 val) { iowrite32(val, sf_dev->base_rst + reg); } diff --git a/drivers/video/fbdev/starfive/starfive_mipi_tx.c b/drivers/video/fbdev/starfive/starfive_mipi_tx.c index 6ccc9780507e..931c2e53232f 100644 --- a/drivers/video/fbdev/starfive/starfive_mipi_tx.c +++ b/drivers/video/fbdev/starfive/starfive_mipi_tx.c @@ -542,7 +542,7 @@ void dsi_main_cfg(struct sf_fb_data *sf_dev) MIPITX_PRT("DSI TVG main ctrl 0xfc: 0x%x\n", tvg_cfg); } -int dsitx_dcs_write(struct sf_fb_data *sf_dev, int n, ...) +int dsitx_dcs_write(struct sf_fb_data *sf_dev, int cmd_size, ...) { int ret = 0; u32 exp_sts_mask = 0x2; // [1]write complete @@ -553,7 +553,6 @@ int dsitx_dcs_write(struct sf_fb_data *sf_dev, int n, ...) va_list ap; // dcs cmd config - int cmd_size = n; int cmd_head = (cmd_size < 2 ? CMD_HEAD_WRITE_0 : (cmd_size < 3 ? CMD_HEAD_WRITE_1 : CMD_HEAD_WRITE_N));