Re: [PATCH] fbdev: i810: include i810_main.h in i810_dvt.c

From: Jani Nikula
Date: Wed May 17 2023 - 04:58:04 EST


On Wed, 17 May 2023, "Arnd Bergmann" <arnd@xxxxxxxx> wrote:
> On Wed, May 17, 2023, at 10:46, Jani Nikula wrote:
>> On Tue, 16 May 2023, Arnd Bergmann <arnd@xxxxxxxxxx> wrote:
>
>>>
>>> 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>
>
> Thanks!
>
>> 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.
>
> I'm fairly sure I looked at that and did not see a problem as
> i810_main.h is already included in that file, it was added
> in 2006 with commit a0aa7d063927 ("[PATCH] drivers/video/: possible
> cleanups").

True that, my bad. (Which kind of puts the R-b above in doubt, but hey,
at least I looked at it. ;)

BR,
Jani.

>
> Arnd

--
Jani Nikula, Intel Open Source Graphics Center