Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[deliverable/linux.git] / arch / arm / mach-imx / avic.c

diff --git a/arch/arm/mach-imx/avic.c b/arch/arm/mach-imx/avic.c
index 7fa176e792bd16fc7b71959ff0f57dcf23ec32d7..1afccae0420c34815e239d56d36cba6f9d50d929 100644 (file)
--- a/arch/arm/mach-imx/avic.c
+++ b/arch/arm/mach-imx/avic.c
@@ -55,23 +55,20 @@ static void __iomem *avic_base;
 static struct irq_domain *domain;
 
 #ifdef CONFIG_FIQ
-static int avic_set_irq_fiq(unsigned int irq, unsigned int type)
+static int avic_set_irq_fiq(unsigned int hwirq, unsigned int type)
 {
-       struct irq_data *d = irq_get_irq_data(irq);
        unsigned int irqt;
 
-       irq = d->hwirq;
-
-       if (irq >= AVIC_NUM_IRQS)
+       if (hwirq >= AVIC_NUM_IRQS)
                return -EINVAL;
 
-       if (irq < AVIC_NUM_IRQS / 2) {
-               irqt = imx_readl(avic_base + AVIC_INTTYPEL) & ~(1 << irq);
-               imx_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEL);
+       if (hwirq < AVIC_NUM_IRQS / 2) {
+               irqt = imx_readl(avic_base + AVIC_INTTYPEL) & ~(1 << hwirq);
+               imx_writel(irqt | (!!type << hwirq), avic_base + AVIC_INTTYPEL);
        } else {
-               irq -= AVIC_NUM_IRQS / 2;
-               irqt = imx_readl(avic_base + AVIC_INTTYPEH) & ~(1 << irq);
-               imx_writel(irqt | (!!type << irq), avic_base + AVIC_INTTYPEH);
+               hwirq -= AVIC_NUM_IRQS / 2;
+               irqt = imx_readl(avic_base + AVIC_INTTYPEH) & ~(1 << hwirq);
+               imx_writel(irqt | (!!type << hwirq), avic_base + AVIC_INTTYPEH);
        }
 
        return 0;