dell-smbios: rename release_buffer() to dell_smbios_release_buffer()

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

diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 55e47828ddfcb66f2a4ad00ae049c8576ed03698..83af1cb3633379e12328c531724717391a8e6978 100644 (file)
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -74,7 +74,7 @@ static inline u32 __bit(int nr)
 
 static void gsta_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
 {
-       struct gsta_gpio *chip = container_of(gpio, struct gsta_gpio, gpio);
+       struct gsta_gpio *chip = gpiochip_get_data(gpio);
        struct gsta_regs __iomem *regs = __regs(chip, nr);
        u32 bit = __bit(nr);
 
@@ -86,17 +86,17 @@ static void gsta_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
 
 static int gsta_gpio_get(struct gpio_chip *gpio, unsigned nr)
 {
-       struct gsta_gpio *chip = container_of(gpio, struct gsta_gpio, gpio);
+       struct gsta_gpio *chip = gpiochip_get_data(gpio);
        struct gsta_regs __iomem *regs = __regs(chip, nr);
        u32 bit = __bit(nr);
 
-       return readl(&regs->dat) & bit;
+       return !!(readl(&regs->dat) & bit);
 }
 
 static int gsta_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
                                      int val)
 {
-       struct gsta_gpio *chip = container_of(gpio, struct gsta_gpio, gpio);
+       struct gsta_gpio *chip = gpiochip_get_data(gpio);
        struct gsta_regs __iomem *regs = __regs(chip, nr);
        u32 bit = __bit(nr);
 
@@ -111,7 +111,7 @@ static int gsta_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
 
 static int gsta_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 {
-       struct gsta_gpio *chip = container_of(gpio, struct gsta_gpio, gpio);
+       struct gsta_gpio *chip = gpiochip_get_data(gpio);
        struct gsta_regs __iomem *regs = __regs(chip, nr);
        u32 bit = __bit(nr);
 
@@ -121,7 +121,7 @@ static int gsta_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
 
 static int gsta_gpio_to_irq(struct gpio_chip *gpio, unsigned offset)
 {
-       struct gsta_gpio *chip = container_of(gpio, struct gsta_gpio, gpio);
+       struct gsta_gpio *chip = gpiochip_get_data(gpio);
        return chip->irq_base + offset;
 }
 
@@ -409,7 +409,7 @@ static int gsta_probe(struct platform_device *dev)
                goto err_free_descs;
        }
 
-       err = gpiochip_add(&chip->gpio);
+       err = gpiochip_add_data(&chip->gpio, chip);
        if (err < 0) {
                dev_err(&dev->dev, "sta2x11 gpio: Can't register (%i)\n",
                        -err);