MN10300: Convert ASB2364 FPGA irq_chip to new functions

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/arch/mn10300/unit-asb2364/irq-fpga.c b/arch/mn10300/unit-asb2364/irq-fpga.c
index fcf29754e4d1770b4f1d1867ccad8d4e4325b1a2..4204a6c62a25435c4e74e4b29a18fc5ae3b6072c 100644 (file)
--- a/arch/mn10300/unit-asb2364/irq-fpga.c
+++ b/arch/mn10300/unit-asb2364/irq-fpga.c
@@ -17,38 +17,38 @@
 /*
  * FPGA PIC operations
  */
-static void asb2364_fpga_mask(unsigned int irq)
+static void asb2364_fpga_mask(struct irq_data *d)
 {
-       ASB2364_FPGA_REG_MASK(irq - NR_CPU_IRQS) = 0x0001;
+       ASB2364_FPGA_REG_MASK(d->irq - NR_CPU_IRQS) = 0x0001;
        SyncExBus();
 }
 
-static void asb2364_fpga_ack(unsigned int irq)
+static void asb2364_fpga_ack(struct irq_data *d)
 {
-       ASB2364_FPGA_REG_IRQ(irq - NR_CPU_IRQS) = 0x0001;
+       ASB2364_FPGA_REG_IRQ(d->irq - NR_CPU_IRQS) = 0x0001;
        SyncExBus();
 }
 
-static void asb2364_fpga_mask_ack(unsigned int irq)
+static void asb2364_fpga_mask_ack(struct irq_data *d)
 {
-       ASB2364_FPGA_REG_MASK(irq - NR_CPU_IRQS) = 0x0001;
+       ASB2364_FPGA_REG_MASK(d->irq - NR_CPU_IRQS) = 0x0001;
        SyncExBus();
-       ASB2364_FPGA_REG_IRQ(irq - NR_CPU_IRQS) = 0x0001;
+       ASB2364_FPGA_REG_IRQ(d->irq - NR_CPU_IRQS) = 0x0001;
        SyncExBus();
 }
 
-static void asb2364_fpga_unmask(unsigned int irq)
+static void asb2364_fpga_unmask(struct irq_data *d)
 {
-       ASB2364_FPGA_REG_MASK(irq - NR_CPU_IRQS) = 0x0000;
+       ASB2364_FPGA_REG_MASK(d->irq - NR_CPU_IRQS) = 0x0000;
        SyncExBus();
 }
 
 static struct irq_chip asb2364_fpga_pic = {
        .name           = "fpga",
-       .ack            = asb2364_fpga_ack,
-       .mask           = asb2364_fpga_mask,
-       .mask_ack       = asb2364_fpga_mask_ack,
-       .unmask         = asb2364_fpga_unmask,
+       .irq_ack        = asb2364_fpga_ack,
+       .irq_mask       = asb2364_fpga_mask,
+       .irq_mask_ack   = asb2364_fpga_mask_ack,
+       .irq_unmask     = asb2364_fpga_unmask,
 };
 
 /*