1 files changed, 9 insertions, 8 deletions

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 3072dbea5c1f..dca20de306bb 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -122,15 +122,15 @@ EXPORT_SYMBOL(lubbock_set_misc_wr);
 
 static unsigned long lubbock_irq_enabled;
 
-static void lubbock_mask_irq(unsigned int irq)
+static void lubbock_mask_irq(struct irq_data *d)
 {
-        int lubbock_irq = (irq - LUBBOCK_IRQ(0));
+        int lubbock_irq = (d->irq - LUBBOCK_IRQ(0));
         LUB_IRQ_MASK_EN = (lubbock_irq_enabled &= ~(1 << lubbock_irq));
 }
 
-static void lubbock_unmask_irq(unsigned int irq)
+static void lubbock_unmask_irq(struct irq_data *d)
 {
-        int lubbock_irq = (irq - LUBBOCK_IRQ(0));
+        int lubbock_irq = (d->irq - LUBBOCK_IRQ(0));
         /* the irq can be acknowledged only if deasserted, so it's done here */
         LUB_IRQ_SET_CLR &= ~(1 << lubbock_irq);
         LUB_IRQ_MASK_EN = (lubbock_irq_enabled |= (1 << lubbock_irq));
@@ -138,16 +138,17 @@ static void lubbock_unmask_irq(unsigned int irq)
 
 static struct irq_chip lubbock_irq_chip = {
         .name           = "FPGA",
-        .ack            = lubbock_mask_irq,
-        .mask           = lubbock_mask_irq,
-        .unmask         = lubbock_unmask_irq,
+        .irq_ack        = lubbock_mask_irq,
+        .irq_mask       = lubbock_mask_irq,
+        .irq_unmask     = lubbock_unmask_irq,
 };
 
 static void lubbock_irq_handler(unsigned int irq, struct irq_desc *desc)
 {
         unsigned long pending = LUB_IRQ_SET_CLR & lubbock_irq_enabled;
         do {
-                desc->chip->ack(irq);   /* clear our parent irq */
+                /* clear our parent irq */
+                desc->irq_data.chip->irq_ack(&desc->irq_data);
                 if (likely(pending)) {
                         irq = LUBBOCK_IRQ(0) + __ffs(pending);
                         generic_handle_irq(irq);