On Mon, Apr 27, 2009 at 04:59:48PM +0200, Florian Fainelli wrote:
> Trying to build MSP4200 VoIP defconfig also fails on msp_irq_slp.c
> with a non-existing reference to mask_slp_irq, which is in turn
> mask_msp_slp_irq. Passed that, we will also miss a comma when
> calling set_irq_chip_and_handler. This patch fixes both issues.
>
> Signed-off-by: Florian Fainelli <florian@openwrt.org>
> ---
> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> index f5f1b8d..66f6f85 100644
> --- a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> +++ b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> @@ -45,7 +45,7 @@ static inline void mask_msp_slp_irq(unsigned int irq)
> */
> static inline void ack_msp_slp_irq(unsigned int irq)
> {
> - mask_slp_irq(irq);
> + mask_msp_slp_irq(irq);
>
> /*
> * only really necessary for 18, 16-14 and sometimes 3:0 (since
The whole irq chip thing in this file is looking suspect as it treats
acknowledging and mask an interrupt as the same thing. Sure that is the
right thing?
> @@ -79,7 +79,7 @@ void __init msp_slp_irq_init(void)
>
> /* initialize all the IRQ descriptors */
> for (i = MSP_SLP_INTBASE; i < MSP_PER_INTBASE + 32; i++)
> - set_irq_chip_and_handler(i, &msp_slp_irq_controller
> + set_irq_chip_and_handler(i, &msp_slp_irq_controller,
> handle_level_irq);
> }
>
> diff --git a/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> b/arch/mips/pmc-sierra/msp71xx/msp_irq_slp.c
> index f5f1b8d..66f6f85 100644
Please don't send the patch twice in one email ...
Ralf
|