Re: [PATCH 5/7] MIPS: dec: Remove dec_irq_dispatch()

[Thomas Bogendoerfer]

On Tue, Feb 18, 2025 at 08:58:42PM +0800, WangYuli wrote:
> Currently, dec_irq_dispatch() is exclusively invoked by int-handler.S.
> Inline the do_IRQ call into int-handler.S to silence the compiler
> warning.
> 
> Fix follow error with gcc-14 when -Werror:
> 
> arch/mips/dec/setup.c:780:25: error: no previous prototype for ‘dec_irq_dispatch’ [-Werror=missing-prototypes]
>   780 | asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)
>       |                         ^~~~~~~~~~~~~~~~
> cc1: all warnings being treated as errors
> make[7]: *** [scripts/Makefile.build:207: arch/mips/dec/setup.o] Error 1
> make[6]: *** [scripts/Makefile.build:465: arch/mips/dec] Error 2
> make[5]: *** [scripts/Makefile.build:465: arch/mips] Error 2
> make[5]: *** Waiting for unfinished jobs....
> make[4]: *** [Makefile:1992: .] Error 2
> make[3]: *** [debian/rules:74: build-arch] Error 2
> dpkg-buildpackage: error: make -f debian/rules binary subprocess returned exit status 2
> make[2]: *** [scripts/Makefile.package:126: bindeb-pkg] Error 2
> make[1]: *** [/mnt/83364c87-f5ee-4ae8-b862-930f1bd74feb/Projects/CommitUpstream/LinuxKernel/Temp/linux/Makefile:1625: bindeb-pkg] Error 2
> make: *** [Makefile:251: __sub-make] Error 2
> 
> Signed-off-by: WangYuli <wangyuli@xxxxxxxxxxxxx>
> ---
>  arch/mips/dec/int-handler.S | 2 +-
>  arch/mips/dec/setup.c       | 6 ------
>  2 files changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/arch/mips/dec/int-handler.S b/arch/mips/dec/int-handler.S
> index 011d1d678840..a0b439c90488 100644
> --- a/arch/mips/dec/int-handler.S
> +++ b/arch/mips/dec/int-handler.S
> @@ -277,7 +277,7 @@
>  		 srlv	t3,t1,t2
>  
>  handle_it:
> -		j	dec_irq_dispatch
> +		j	do_IRQ
>  		 nop
>  
>  #if defined(CONFIG_32BIT) && defined(CONFIG_MIPS_FP_SUPPORT)
> diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c
> index 56a7ecf06b7b..6ba4c4973c9a 100644
> --- a/arch/mips/dec/setup.c
> +++ b/arch/mips/dec/setup.c
> @@ -771,9 +771,3 @@ void __init arch_init_irq(void)
>  			pr_err("Failed to register halt interrupt\n");
>  	}
>  }
> -
> -asmlinkage unsigned int dec_irq_dispatch(unsigned int irq)
> -{
> -	do_IRQ(irq);
> -	return 0;
> -}
> -- 
> 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 ]