From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 6 Dec 2012 22:39:27 +0000 (+0000)
Subject: simplify IRQ controller code
X-Git-Tag: reboot~12086
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=f85115efd8e3ef399f015bbbe9d9468d5a5ba8b4

simplify IRQ controller code

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 34546
---

diff --git a/target/linux/adm8668/files/arch/mips/adm8668/irq.c b/target/linux/adm8668/files/arch/mips/adm8668/irq.c
index e048c15c8a..9fa9e675e4 100644
--- a/target/linux/adm8668/files/arch/mips/adm8668/irq.c
+++ b/target/linux/adm8668/files/arch/mips/adm8668/irq.c
@@ -52,33 +52,13 @@ void plat_irq_dispatch(void)
  */
 static void enable_adm8668_irq(struct irq_data *d)
 {
-	int irq = d->irq;
-
-	if ((irq < 0) || (irq > NR_IRQS))
-		return;
-
-	ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << irq);
+	ADM8668_INTC_REG(IRQ_ENABLE_REG) = (1 << d->irq);
 }
 
 
-/*
- * disable 8668 irq
- */
-static void disable_adm8668_irq(struct irq_data *d)
-{
-	int irq = d->irq;
-
-	if ((irq < 0) || (irq > NR_IRQS))
-		return;
-
-	ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
-}
-
 static void ack_adm8668_irq(struct irq_data *d)
 {
-	int irq = d->irq;
-
-	ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << irq);
+	ADM8668_INTC_REG(IRQ_DISABLE_REG) = (1 << d->irq);
 }
 
 /*
@@ -88,7 +68,7 @@ static void ack_adm8668_irq(struct irq_data *d)
 static struct irq_chip adm8668_irq_type = {
 	.name = "adm8668",
 	.irq_ack = ack_adm8668_irq,
-	.irq_mask = disable_adm8668_irq,
+	.irq_mask = ack_adm8668_irq,
 	.irq_unmask = enable_adm8668_irq
 };