diff options
author | Emil Renner Berthing <kernel@esmil.dk> | 2021-05-06 22:16:33 +0300 |
---|---|---|
committer | Emil Renner Berthing <kernel@esmil.dk> | 2021-06-07 02:11:18 +0300 |
commit | e5f2664b486b1614788d0243a46ff646d0299923 (patch) | |
tree | ec12077adff7b70a9d00394cc732cd58c2fddce6 | |
parent | 3fe960822628aadde0cc3fc56cc7c94524057788 (diff) | |
download | linux-e5f2664b486b1614788d0243a46ff646d0299923.tar.xz |
video: fbdev: starfive: fix compiler warnings
Signed-off-by: Emil Renner Berthing <kernel@esmil.dk>
-rw-r--r-- | drivers/video/fbdev/starfive/starfive_comm_regs.h | 4 | ||||
-rw-r--r-- | drivers/video/fbdev/starfive/starfive_mipi_tx.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/video/fbdev/starfive/starfive_comm_regs.h b/drivers/video/fbdev/starfive/starfive_comm_regs.h index 4c19c58d9c3f..36c150bbfc51 100644 --- a/drivers/video/fbdev/starfive/starfive_comm_regs.h +++ b/drivers/video/fbdev/starfive/starfive_comm_regs.h @@ -71,7 +71,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); } @@ -86,7 +86,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)); |