linux-mips
[Top] [All Lists]

[PATCH] fix build failures on msp_irq_slp.c

To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH] fix build failures on msp_irq_slp.c
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 27 Apr 2009 16:59:48 +0200
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:content-type:message-id; bh=DotBlUOrJ+mXmlz1k2nO53m2YfWtW2t0fHrHX5BLDFY=; b=h178MFyFXo47yU7coNFMK/05OjIqUyFdzNGcFHiPGbgd0h7OGAlJ1YrG+MSwap+m6G uIpTv+d4iI4yMdabuGlGwdoTuv+zZ9EJkD2U23E90dGhincwqa+RrHOEhW5LVxhp0UXr L9+VCveRcufjQ8/l0nFvPl2aNj9S9ycWxcUiw=
Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to :content-type:message-id; b=RrX6TonnA6qFOK550U9T4Nkzo5yyjrUIFfkMxEVQKqmLDbls9J4DxKn5vPBwVBxy+j kn+divrzRz0cplsSno6D5fjcsYyYo0WAbCwx0Bn+IcQ4Bh7/UWe4tCN1uETUPuNcGxyJ 1JdWiJ5diEr4ctG1dMDymDQG/+kBWJ/Pto5JY=
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
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
@@ -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
--- 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
@@ -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);
 }
 
<Prev in Thread] Current Thread [Next in Thread>