Re: [PATCH 4/7] MIPS: ds1287: Match ds1287_set_base_clock() function types

[Thomas Bogendoerfer <tsbogend@alpha.franken.de>]

On Tue, Feb 18, 2025 at 08:57:55PM +0800, WangYuli wrote:
> Synchronize the declaration of ds1287_set_base_clock() between
> cevt-ds1287.c and ds1287.h.
> 
> Fix follow error with gcc-14 when -Werror:
> 
> arch/mips/kernel/cevt-ds1287.c:21:5: error: conflicting types for ‘ds1287_set_base_clock’; have ‘int(unsigned int)’
>    21 | int ds1287_set_base_clock(unsigned int hz)
>       |     ^~~~~~~~~~~~~~~~~~~~~
> In file included from arch/mips/kernel/cevt-ds1287.c:13:
> ./arch/mips/include/asm/ds1287.h:11:13: note: previous declaration of ‘ds1287_set_base_clock’ with type ‘void(unsigned int)’
>    11 | extern void ds1287_set_base_clock(unsigned int clock);
>       |             ^~~~~~~~~~~~~~~~~~~~~
> make[7]: *** [scripts/Makefile.build:207: arch/mips/kernel/cevt-ds1287.o] Error 1
> make[6]: *** [scripts/Makefile.build:465: arch/mips/kernel] Error 2
> make[6]: *** Waiting for unfinished jobs....
> 
> Signed-off-by: WangYuli <wangyuli@uniontech.com>
> ---
>  arch/mips/include/asm/ds1287.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/mips/include/asm/ds1287.h b/arch/mips/include/asm/ds1287.h
> index 46cfb01f9a14..51cb61fd4c03 100644
> --- a/arch/mips/include/asm/ds1287.h
> +++ b/arch/mips/include/asm/ds1287.h
> @@ -8,7 +8,7 @@
>  #define __ASM_DS1287_H
>  
>  extern int ds1287_timer_state(void);
> -extern void ds1287_set_base_clock(unsigned int clock);
> +extern int ds1287_set_base_clock(unsigned int hz);
>  extern int ds1287_clockevent_init(int irq);
>  
>  #endif
> -- 
> 2.47.2

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]