Re: sh: replace init_IRQ_ipr() and init_IRQ_intc2() with plat_irq_setup()

[Paul M. <le...@li...>]

On Wed, Jul 18, 2007 at 10:23:05AM +0900, Magnus Damm wrote:
> --- 0001/arch/sh/kernel/irq.c
> +++ work/arch/sh/kernel/irq.c	2007-07-17 17:01:58.000000000 +0900
> @@ -254,12 +254,9 @@ void __init init_IRQ(void)
>  	init_IRQ_pint();
>  #endif
>  
> -#ifdef CONFIG_CPU_HAS_INTC2_IRQ
> -	init_IRQ_intc2();
> -#endif
> -
> -#ifdef CONFIG_CPU_HAS_IPR_IRQ
> -	init_IRQ_ipr();
> +#if defined(CONFIG_CPU_HAS_INTC2_IRQ) || defined(CONFIG_CPU_HAS_INTC2_IRQ) || \
> +    defined(CONFIG_CPU_HAS_INTC_IRQ)
> +	plat_irq_setup();
>  #endif
>  

Eek. How about a weak dummy symbol instead? You've also double-cased
CPU_HAS_INTC2_IRQ, whereas I assume you meant to make one of them
CPU_HAS_IPR_IRQ. On the other hand, is it really a valid state for any
CPU not to have at least one of INTC2/INTC/IPR? In which case, make the
reference to the symbol explicit, and let the linker whine.