aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-12-06 22:39:27 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-12-06 22:39:27 +0000
commitc42e9b5f6a44aadfbcd1ea1f411fb8662dd14878 (patch)
treee95fd07a651830a0835de1e83190e5d83807e415
parent213368a9bd8e6633e9d8d76767ee369b2a748f31 (diff)
downloadupstream-c42e9b5f6a44aadfbcd1ea1f411fb8662dd14878.tar.gz
upstream-c42e9b5f6a44aadfbcd1ea1f411fb8662dd14878.tar.bz2
upstream-c42e9b5f6a44aadfbcd1ea1f411fb8662dd14878.zip
[adm8668] simplify IRQ controller code
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34546 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/adm8668/files/arch/mips/adm8668/irq.c26
1 files changed, 3 insertions, 23 deletions
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
};