]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
m68knommu: Convert 68360 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/68360/ints.c

index a29041c1a8a083e1866f3bbc95721bc5cf33e7a9..8de3feb568c605dff2eeed7506b36411a7608af7 100644 (file)
@@ -37,26 +37,26 @@ extern void *_ramvec[];
 /* The number of spurious interrupts */
 volatile unsigned int num_spurious;
 
-static void intc_irq_unmask(unsigned int irq)
+static void intc_irq_unmask(struct irq_data *d)
 {
-       pquicc->intr_cimr |= (1 << irq);
+       pquicc->intr_cimr |= (1 << d->irq);
 }
 
-static void intc_irq_mask(unsigned int irq)
+static void intc_irq_mask(struct irq_data *d)
 {
-       pquicc->intr_cimr &= ~(1 << irq);
+       pquicc->intr_cimr &= ~(1 << d->irq);
 }
 
-static void intc_irq_ack(unsigned int irq)
+static void intc_irq_ack(struct irq_data *d)
 {
-       pquicc->intr_cisr = (1 << irq);
+       pquicc->intr_cisr = (1 << d->irq);
 }
 
 static struct irq_chip intc_irq_chip = {
        .name           = "M68K-INTC",
-       .mask           = intc_irq_mask,
-       .unmask         = intc_irq_unmask,
-       .ack            = intc_irq_ack,
+       .irq_mask       = intc_irq_mask,
+       .irq_unmask     = intc_irq_unmask,
+       .irq_ack        = intc_irq_ack,
 };
 
 /*