From 679ccdc3c3d0f76e2d5d628244d595ec85003dd7 Mon Sep 17 00:00:00 2001 From: florian Date: Thu, 6 Dec 2012 22:39:27 +0000 Subject: [PATCH] [adm8668] simplify IRQ controller code Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34546 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../adm8668/files/arch/mips/adm8668/irq.c | 26 +++---------------- 1 file 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 e048c15c8..9fa9e675e 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 };