hp-wmi: Remove GPS rfkill support via pre-2009 interface

[linux-2.6-block.git] / drivers / gpio / gpio-pl061.c

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 4d4b3767670220a03076301ced6b3b12cffcd265..5cb38212bbc0526f63d398aac2837f7875d5b669 100644 (file)
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/io.h>
 #include <linux/ioport.h>
+#include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/irqchip/chained_irq.h>
 #include <linux/bitops.h>
@@ -60,7 +61,7 @@ struct pl061_gpio {
 
 static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
 {
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        unsigned long flags;
        unsigned char gpiodir;
 
@@ -79,7 +80,7 @@ static int pl061_direction_input(struct gpio_chip *gc, unsigned offset)
 static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
                int value)
 {
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        unsigned long flags;
        unsigned char gpiodir;
 
@@ -104,14 +105,14 @@ static int pl061_direction_output(struct gpio_chip *gc, unsigned offset,
 
 static int pl061_get_value(struct gpio_chip *gc, unsigned offset)
 {
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
 
        return !!readb(chip->base + (BIT(offset + 2)));
 }
 
 static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value)
 {
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
 
        writeb(!!value << offset, chip->base + (BIT(offset + 2)));
 }
@@ -119,7 +120,7 @@ static void pl061_set_value(struct gpio_chip *gc, unsigned offset, int value)
 static int pl061_irq_type(struct irq_data *d, unsigned trigger)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        int offset = irqd_to_hwirq(d);
        unsigned long flags;
        u8 gpiois, gpioibe, gpioiev;
@@ -131,7 +132,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
        if ((trigger & (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW)) &&
            (trigger & (IRQ_TYPE_EDGE_RISING | IRQ_TYPE_EDGE_FALLING)))
        {
-               dev_err(gc->dev,
+               dev_err(gc->parent,
                        "trying to configure line %d for both level and edge "
                        "detection, choose one!\n",
                        offset);
@@ -158,7 +159,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
                else
                        gpioiev &= ~bit;
                irq_set_handler_locked(d, handle_level_irq);
-               dev_dbg(gc->dev, "line %d: IRQ on %s level\n",
+               dev_dbg(gc->parent, "line %d: IRQ on %s level\n",
                        offset,
                        polarity ? "HIGH" : "LOW");
        } else if ((trigger & IRQ_TYPE_EDGE_BOTH) == IRQ_TYPE_EDGE_BOTH) {
@@ -167,7 +168,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
                /* Select both edges, setting this makes GPIOEV be ignored */
                gpioibe |= bit;
                irq_set_handler_locked(d, handle_edge_irq);
-               dev_dbg(gc->dev, "line %d: IRQ on both edges\n", offset);
+               dev_dbg(gc->parent, "line %d: IRQ on both edges\n", offset);
        } else if ((trigger & IRQ_TYPE_EDGE_RISING) ||
                   (trigger & IRQ_TYPE_EDGE_FALLING)) {
                bool rising = trigger & IRQ_TYPE_EDGE_RISING;
@@ -182,7 +183,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
                else
                        gpioiev &= ~bit;
                irq_set_handler_locked(d, handle_edge_irq);
-               dev_dbg(gc->dev, "line %d: IRQ on %s edge\n",
+               dev_dbg(gc->parent, "line %d: IRQ on %s edge\n",
                        offset,
                        rising ? "RISING" : "FALLING");
        } else {
@@ -191,7 +192,7 @@ static int pl061_irq_type(struct irq_data *d, unsigned trigger)
                gpioibe &= ~bit;
                gpioiev &= ~bit;
                irq_set_handler_locked(d, handle_bad_irq);
-               dev_warn(gc->dev, "no trigger selected for line %d\n",
+               dev_warn(gc->parent, "no trigger selected for line %d\n",
                         offset);
        }
 
@@ -209,7 +210,7 @@ static void pl061_irq_handler(struct irq_desc *desc)
        unsigned long pending;
        int offset;
        struct gpio_chip *gc = irq_desc_get_handler_data(desc);
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        struct irq_chip *irqchip = irq_desc_get_chip(desc);
 
        chained_irq_enter(irqchip, desc);
@@ -227,7 +228,7 @@ static void pl061_irq_handler(struct irq_desc *desc)
 static void pl061_irq_mask(struct irq_data *d)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
        u8 gpioie;
 
@@ -240,7 +241,7 @@ static void pl061_irq_mask(struct irq_data *d)
 static void pl061_irq_unmask(struct irq_data *d)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
        u8 gpioie;
 
@@ -261,7 +262,7 @@ static void pl061_irq_unmask(struct irq_data *d)
 static void pl061_irq_ack(struct irq_data *d)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-       struct pl061_gpio *chip = container_of(gc, struct pl061_gpio, gc);
+       struct pl061_gpio *chip = gpiochip_get_data(gc);
        u8 mask = BIT(irqd_to_hwirq(d) % PL061_GPIO_NR);
 
        spin_lock(&chip->lock);
@@ -269,12 +270,20 @@ static void pl061_irq_ack(struct irq_data *d)
        spin_unlock(&chip->lock);
 }
 
+static int pl061_irq_set_wake(struct irq_data *d, unsigned int state)
+{
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+
+       return irq_set_irq_wake(gc->irq_parent, state);
+}
+
 static struct irq_chip pl061_irqchip = {
        .name           = "pl061",
        .irq_ack        = pl061_irq_ack,
        .irq_mask       = pl061_irq_mask,
        .irq_unmask     = pl061_irq_unmask,
        .irq_set_type   = pl061_irq_type,
+       .irq_set_wake   = pl061_irq_set_wake,
 };
 
 static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
@@ -316,10 +325,10 @@ static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
        chip->gc.set = pl061_set_value;
        chip->gc.ngpio = PL061_GPIO_NR;
        chip->gc.label = dev_name(dev);
-       chip->gc.dev = dev;
+       chip->gc.parent = dev;
        chip->gc.owner = THIS_MODULE;
 
-       ret = gpiochip_add(&chip->gc);
+       ret = gpiochip_add_data(&chip->gc, chip);
        if (ret)
                return ret;