Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / gpio / adp5588-gpio.c

diff --git a/drivers/gpio/adp5588-gpio.c b/drivers/gpio/adp5588-gpio.c
index 0871f78af5933a83445a19b2bf956b925d3f34ba..33fc685cb3852bb311608b364717e5cb34fdb29f 100644 (file)
--- a/drivers/gpio/adp5588-gpio.c
+++ b/drivers/gpio/adp5588-gpio.c
@@ -146,9 +146,10 @@ static int adp5588_gpio_to_irq(struct gpio_chip *chip, unsigned off)
        return dev->irq_base + off;
 }
 
-static void adp5588_irq_bus_lock(unsigned int irq)
+static void adp5588_irq_bus_lock(struct irq_data *d)
 {
-       struct adp5588_gpio *dev = get_irq_chip_data(irq);
+       struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
+
        mutex_lock(&dev->irq_lock);
 }
 
@@ -160,9 +161,9 @@ static void adp5588_irq_bus_lock(unsigned int irq)
   * and unlocks the bus.
   */
 
-static void adp5588_irq_bus_sync_unlock(unsigned int irq)
+static void adp5588_irq_bus_sync_unlock(struct irq_data *d)
 {
-       struct adp5588_gpio *dev = get_irq_chip_data(irq);
+       struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
        int i;
 
        for (i = 0; i <= ADP5588_BANK(ADP5588_MAXGPIO); i++)
@@ -175,31 +176,31 @@ static void adp5588_irq_bus_sync_unlock(unsigned int irq)
        mutex_unlock(&dev->irq_lock);
 }
 
-static void adp5588_irq_mask(unsigned int irq)
+static void adp5588_irq_mask(struct irq_data *d)
 {
-       struct adp5588_gpio *dev = get_irq_chip_data(irq);
-       unsigned gpio = irq - dev->irq_base;
+       struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
+       unsigned gpio = d->irq - dev->irq_base;
 
        dev->irq_mask[ADP5588_BANK(gpio)] &= ~ADP5588_BIT(gpio);
 }
 
-static void adp5588_irq_unmask(unsigned int irq)
+static void adp5588_irq_unmask(struct irq_data *d)
 {
-       struct adp5588_gpio *dev = get_irq_chip_data(irq);
-       unsigned gpio = irq - dev->irq_base;
+       struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
+       unsigned gpio = d->irq - dev->irq_base;
 
        dev->irq_mask[ADP5588_BANK(gpio)] |= ADP5588_BIT(gpio);
 }
 
-static int adp5588_irq_set_type(unsigned int irq, unsigned int type)
+static int adp5588_irq_set_type(struct irq_data *d, unsigned int type)
 {
-       struct adp5588_gpio *dev = get_irq_chip_data(irq);
-       uint16_t gpio = irq - dev->irq_base;
+       struct adp5588_gpio *dev = irq_data_get_irq_chip_data(d);
+       uint16_t gpio = d->irq - dev->irq_base;
        unsigned bank, bit;
 
        if ((type & IRQ_TYPE_EDGE_BOTH)) {
                dev_err(&dev->client->dev, "irq %d: unsupported type %d\n",
-                       irq, type);
+                       d->irq, type);
                return -EINVAL;
        }
 
@@ -222,11 +223,11 @@ static int adp5588_irq_set_type(unsigned int irq, unsigned int type)
 
 static struct irq_chip adp5588_irq_chip = {
        .name                   = "adp5588",
-       .mask                   = adp5588_irq_mask,
-       .unmask                 = adp5588_irq_unmask,
-       .bus_lock               = adp5588_irq_bus_lock,
-       .bus_sync_unlock        = adp5588_irq_bus_sync_unlock,
-       .set_type               = adp5588_irq_set_type,
+       .irq_mask               = adp5588_irq_mask,
+       .irq_unmask             = adp5588_irq_unmask,
+       .irq_bus_lock           = adp5588_irq_bus_lock,
+       .irq_bus_sync_unlock    = adp5588_irq_bus_sync_unlock,
+       .irq_set_type           = adp5588_irq_set_type,
 };
 
 static int adp5588_gpio_read_intstat(struct i2c_client *client, u8 *buf)