ARM: msm: irq_data conversion.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Acked-by: Gregory Bean <gbean@codeaurora.org>
Acked-by: Daniel Walker <dwalker@codeaurora.org>

1 files changed, 21 insertions, 21 deletions

diff --git a/arch/arm/mach-msm/board-trout-gpio.c b/arch/arm/mach-msm/board-trout-gpio.c
index f8c09ef6666f..a604ec1e44bf 100644
--- a/arch/arm/mach-msm/board-trout-gpio.c
+++ b/arch/arm/mach-msm/board-trout-gpio.c
@@ -113,52 +113,52 @@ static struct msm_gpio_chip msm_gpio_banks[] = {
         TROUT_GPIO_BANK("VIRTUAL", 0x12, TROUT_GPIO_VIRTUAL_BASE, 0),
 };
 
-static void trout_gpio_irq_ack(unsigned int irq)
+static void trout_gpio_irq_ack(struct irq_data *d)
 {
-        int bank = TROUT_INT_TO_BANK(irq);
-        uint8_t mask = TROUT_INT_TO_MASK(irq);
+        int bank = TROUT_INT_TO_BANK(d->irq);
+        uint8_t mask = TROUT_INT_TO_MASK(d->irq);
         int reg = TROUT_BANK_TO_STAT_REG(bank);
-        /*printk(KERN_INFO "trout_gpio_irq_ack irq %d\n", irq);*/
+        /*printk(KERN_INFO "trout_gpio_irq_ack irq %d\n", d->irq);*/
         writeb(mask, TROUT_CPLD_BASE + reg);
 }
 
-static void trout_gpio_irq_mask(unsigned int irq)
+static void trout_gpio_irq_mask(struct irq_data *d)
 {
         unsigned long flags;
         uint8_t reg_val;
-        int bank = TROUT_INT_TO_BANK(irq);
-        uint8_t mask = TROUT_INT_TO_MASK(irq);
+        int bank = TROUT_INT_TO_BANK(d->irq);
+        uint8_t mask = TROUT_INT_TO_MASK(d->irq);
         int reg = TROUT_BANK_TO_MASK_REG(bank);
 
         local_irq_save(flags);
         reg_val = trout_int_mask[bank] |= mask;
         /*printk(KERN_INFO "trout_gpio_irq_mask irq %d => %d:%02x\n",
-               irq, bank, reg_val);*/
+               d->irq, bank, reg_val);*/
         writeb(reg_val, TROUT_CPLD_BASE + reg);
         local_irq_restore(flags);
 }
 
-static void trout_gpio_irq_unmask(unsigned int irq)
+static void trout_gpio_irq_unmask(struct irq_data *d)
 {
         unsigned long flags;
         uint8_t reg_val;
-        int bank = TROUT_INT_TO_BANK(irq);
-        uint8_t mask = TROUT_INT_TO_MASK(irq);
+        int bank = TROUT_INT_TO_BANK(d->irq);
+        uint8_t mask = TROUT_INT_TO_MASK(d->irq);
         int reg = TROUT_BANK_TO_MASK_REG(bank);
 
         local_irq_save(flags);
         reg_val = trout_int_mask[bank] &= ~mask;
         /*printk(KERN_INFO "trout_gpio_irq_unmask irq %d => %d:%02x\n",
-               irq, bank, reg_val);*/
+               d->irq, bank, reg_val);*/
         writeb(reg_val, TROUT_CPLD_BASE + reg);
         local_irq_restore(flags);
 }
 
-int trout_gpio_irq_set_wake(unsigned int irq, unsigned int on)
+int trout_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
 {
         unsigned long flags;
-        int bank = TROUT_INT_TO_BANK(irq);
-        uint8_t mask = TROUT_INT_TO_MASK(irq);
+        int bank = TROUT_INT_TO_BANK(d->irq);
+        uint8_t mask = TROUT_INT_TO_MASK(d->irq);
 
         local_irq_save(flags);
         if(on)
@@ -198,15 +198,15 @@ static void trout_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
                 }
                 int_base += TROUT_INT_BANK0_COUNT;
         }
-        desc->chip->ack(irq);
+        desc->irq_data.chip->irq_ack(&desc->irq_data);
 }
 
 static struct irq_chip trout_gpio_irq_chip = {
-        .name      = "troutgpio",
-        .ack       = trout_gpio_irq_ack,
-        .mask      = trout_gpio_irq_mask,
-        .unmask    = trout_gpio_irq_unmask,
-        .set_wake  = trout_gpio_irq_set_wake,
+        .name          = "troutgpio",
+        .irq_ack       = trout_gpio_irq_ack,
+        .irq_mask      = trout_gpio_irq_mask,
+        .irq_unmask    = trout_gpio_irq_unmask,
+        .irq_set_wake  = trout_gpio_irq_set_wake,
 };
 
 /*