On Tue, 16 May 2023, Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
> From: Arnd Bergmann <arnd@xxxxxxxx>
>
> Building with W=1 shows that a header needs to be included to
> make the prototypes visible:
>
> drivers/video/fbdev/i810/i810_dvt.c:194:6: error: no previous prototype for 'round_off_xres' [-Werror=missing-prototypes]
> drivers/video/fbdev/i810/i810_dvt.c:233:6: error: no previous prototype for 'i810fb_encode_registers' [-Werror=missing-prototypes]
> drivers/video/fbdev/i810/i810_dvt.c:245:6: error: no previous prototype for 'i810fb_fill_var_timings' [-Werror=missing-prototypes]
> drivers/video/fbdev/i810/i810_dvt.c:279:5: error: no previous prototype for 'i810_get_watermark' [-Werror=missing-prototypes]
>
> Adding the header leads to another warning from a mismatched
> prototype, so fix this as well:
>
> drivers/video/fbdev/i810/i810_dvt.c:280:5: error: conflicting types for 'i810_get_watermark'; have 'u32(struct fb_var_screeninfo *,
Changes here look fine,
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
but I think you should try CONFIG_FB_I810_GTF=y to get the same
mismatched prototype error for i810_get_watermark() in i810_gtf.c, and
add the const there while at it. R-b stands for that addition as well.
>
> Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
> ---
> drivers/video/fbdev/i810/i810_dvt.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/i810/i810_dvt.c b/drivers/video/fbdev/i810/i810_dvt.c
> index b4b3670667ab..2082b5c92e8f 100644
> --- a/drivers/video/fbdev/i810/i810_dvt.c
> +++ b/drivers/video/fbdev/i810/i810_dvt.c
> @@ -14,6 +14,7 @@
>
> #include "i810_regs.h"
> #include "i810.h"
> +#include "i810_main.h"
>
> struct mode_registers std_modes[] = {
> /* 640x480 @ 60Hz */
> @@ -276,7 +277,7 @@ void i810fb_fill_var_timings(struct fb_var_screeninfo *var)
> var->upper_margin = total - (yres + var->lower_margin + var->vsync_len);
> }
>
> -u32 i810_get_watermark(struct fb_var_screeninfo *var,
> +u32 i810_get_watermark(const struct fb_var_screeninfo *var,
> struct i810fb_par *par)
> {
> struct mode_registers *params = &par->regs;
--
Jani Nikula, Intel Open Source Graphics Center
