m68knommu: Convert 68328 ints irq_chip to new functions
authorThomas Gleixner <tglx@linutronix.de>
Sun, 6 Feb 2011 23:39:14 +0000 (23:39 +0000)
committerGreg Ungerer <gerg@uclinux.org>
Tue, 15 Mar 2011 11:01:52 +0000 (21:01 +1000)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
arch/m68knommu/platform/68328/ints.c

index 2a3af19..e563183 100644 (file)
@@ -135,20 +135,20 @@ void process_int(int vec, struct pt_regs *fp)
        }
 }
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-       IMR &= ~(1<<irq);
+       IMR &= ~(1 << d->irq);
 }
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
-       IMR |= (1<<irq);
+       IMR |= (1 << d->irq);
 }
 
 static struct irq_chip intc_irq_chip = {
        .name           = "M68K-INTC",
-       .mask           = intc_irq_mask,
-       .unmask         = intc_irq_unmask,
+       .irq_mask       = intc_irq_mask,
+       .irq_unmask     = intc_irq_unmask,
 };
 
 /*