gpio: sx150x: irq_data conversion

Converts irq_chips and flow handlers over to the new struct irq_data based
irq_chip functions.

Signed-off-by: Lennert Buytenhek <buytenh@secretlab.ca>
Cc: Gregory Bean <gbean@codeaurora.org>
Tested-by: Rohit Vaswani <rvaswani@codeaurora.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/gpio/sx150x.c b/drivers/gpio/sx150x.c
index 823559ab0e243610ca8e5ff3b5983aca3d53b7bb..e60be0015c9bf59883a5a8ae1efaa71151c8ff5d 100644 (file)
--- a/drivers/gpio/sx150x.c
+++ b/drivers/gpio/sx150x.c
@@ -304,36 +304,36 @@ static int sx150x_gpio_to_irq(struct gpio_chip *gc, unsigned offset)
        return chip->irq_base + offset;
 }
 
-static void sx150x_irq_mask(unsigned int irq)
+static void sx150x_irq_mask(struct irq_data *d)
 {
-       struct irq_chip *ic = get_irq_chip(irq);
+       struct irq_chip *ic = irq_data_get_irq_chip(d);
        struct sx150x_chip *chip;
        unsigned n;
 
        chip = container_of(ic, struct sx150x_chip, irq_chip);
-       n = irq - chip->irq_base;
+       n = d->irq - chip->irq_base;
 
        sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 1);
        sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense, 0);
 }
 
-static void sx150x_irq_unmask(unsigned int irq)
+static void sx150x_irq_unmask(struct irq_data *d)
 {
-       struct irq_chip *ic = get_irq_chip(irq);
+       struct irq_chip *ic = irq_data_get_irq_chip(d);
        struct sx150x_chip *chip;
        unsigned n;
 
        chip = container_of(ic, struct sx150x_chip, irq_chip);
-       n = irq - chip->irq_base;
+       n = d->irq - chip->irq_base;
 
        sx150x_write_cfg(chip, n, 1, chip->dev_cfg->reg_irq_mask, 0);
        sx150x_write_cfg(chip, n, 2, chip->dev_cfg->reg_sense,
                         chip->irq_sense >> (n * 2));
 }
 
-static int sx150x_irq_set_type(unsigned int irq, unsigned int flow_type)
+static int sx150x_irq_set_type(struct irq_data *d, unsigned int flow_type)
 {
-       struct irq_chip *ic = get_irq_chip(irq);
+       struct irq_chip *ic = irq_data_get_irq_chip(d);
        struct sx150x_chip *chip;
        unsigned n, val = 0;
 
@@ -341,7 +341,7 @@ static int sx150x_irq_set_type(unsigned int irq, unsigned int flow_type)
                return -EINVAL;
 
        chip = container_of(ic, struct sx150x_chip, irq_chip);
-       n = irq - chip->irq_base;
+       n = d->irq - chip->irq_base;
 
        if (flow_type & IRQ_TYPE_EDGE_RISING)
                val |= 0x1;
@@ -386,9 +386,9 @@ static irqreturn_t sx150x_irq_thread_fn(int irq, void *dev_id)
        return (nhandled > 0 ? IRQ_HANDLED : IRQ_NONE);
 }
 
-static void sx150x_irq_bus_lock(unsigned int irq)
+static void sx150x_irq_bus_lock(struct irq_data *d)
 {
-       struct irq_chip *ic = get_irq_chip(irq);
+       struct irq_chip *ic = irq_data_get_irq_chip(d);
        struct sx150x_chip *chip;
 
        chip = container_of(ic, struct sx150x_chip, irq_chip);
@@ -396,9 +396,9 @@ static void sx150x_irq_bus_lock(unsigned int irq)
        mutex_lock(&chip->lock);
 }
 
-static void sx150x_irq_bus_sync_unlock(unsigned int irq)
+static void sx150x_irq_bus_sync_unlock(struct irq_data *d)
 {
-       struct irq_chip *ic = get_irq_chip(irq);
+       struct irq_chip *ic = irq_data_get_irq_chip(d);
        struct sx150x_chip *chip;
        unsigned n;
 
@@ -437,16 +437,16 @@ static void sx150x_init_chip(struct sx150x_chip *chip,
        if (pdata->oscio_is_gpo)
                ++chip->gpio_chip.ngpio;
 
-       chip->irq_chip.name            = client->name;
-       chip->irq_chip.mask            = sx150x_irq_mask;
-       chip->irq_chip.unmask          = sx150x_irq_unmask;
-       chip->irq_chip.set_type        = sx150x_irq_set_type;
-       chip->irq_chip.bus_lock        = sx150x_irq_bus_lock;
-       chip->irq_chip.bus_sync_unlock = sx150x_irq_bus_sync_unlock;
-       chip->irq_summary              = -1;
-       chip->irq_base                 = -1;
-       chip->irq_sense                = 0;
-       chip->irq_set_type_pending     = 0;
+       chip->irq_chip.name                = client->name;
+       chip->irq_chip.irq_mask            = sx150x_irq_mask;
+       chip->irq_chip.irq_unmask          = sx150x_irq_unmask;
+       chip->irq_chip.irq_set_type        = sx150x_irq_set_type;
+       chip->irq_chip.irq_bus_lock        = sx150x_irq_bus_lock;
+       chip->irq_chip.irq_bus_sync_unlock = sx150x_irq_bus_sync_unlock;
+       chip->irq_summary                  = -1;
+       chip->irq_base                     = -1;
+       chip->irq_sense                    = 0;
+       chip->irq_set_type_pending         = 0;
 }
 
 static int sx150x_init_io(struct sx150x_chip *chip, u8 base, u16 cfg)