Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

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

diff --git a/drivers/gpio/gpio-kempld.c b/drivers/gpio/gpio-kempld.c
index 83f281dda1e0f41fc4be3c8d2cb4e02407ab837d..01117747b965923455f29062878c1e379033a6c2 100644 (file)
--- a/drivers/gpio/gpio-kempld.c
+++ b/drivers/gpio/gpio-kempld.c
@@ -65,17 +65,15 @@ static int kempld_gpio_get_bit(struct kempld_device_data *pld, u8 reg, u8 bit)
 
 static int kempld_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-       struct kempld_gpio_data *gpio
-               = container_of(chip, struct kempld_gpio_data, chip);
+       struct kempld_gpio_data *gpio = gpiochip_get_data(chip);
        struct kempld_device_data *pld = gpio->pld;
 
-       return kempld_gpio_get_bit(pld, KEMPLD_GPIO_LVL_NUM(offset), offset);
+       return !!kempld_gpio_get_bit(pld, KEMPLD_GPIO_LVL_NUM(offset), offset);
 }
 
 static void kempld_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-       struct kempld_gpio_data *gpio
-               = container_of(chip, struct kempld_gpio_data, chip);
+       struct kempld_gpio_data *gpio = gpiochip_get_data(chip);
        struct kempld_device_data *pld = gpio->pld;
 
        kempld_get_mutex(pld);
@@ -85,8 +83,7 @@ static void kempld_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 
 static int kempld_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 {
-       struct kempld_gpio_data *gpio
-               = container_of(chip, struct kempld_gpio_data, chip);
+       struct kempld_gpio_data *gpio = gpiochip_get_data(chip);
        struct kempld_device_data *pld = gpio->pld;
 
        kempld_get_mutex(pld);
@@ -99,8 +96,7 @@ static int kempld_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
 static int kempld_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
                                        int value)
 {
-       struct kempld_gpio_data *gpio
-               = container_of(chip, struct kempld_gpio_data, chip);
+       struct kempld_gpio_data *gpio = gpiochip_get_data(chip);
        struct kempld_device_data *pld = gpio->pld;
 
        kempld_get_mutex(pld);
@@ -113,8 +109,7 @@ static int kempld_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
 
 static int kempld_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
 {
-       struct kempld_gpio_data *gpio
-               = container_of(chip, struct kempld_gpio_data, chip);
+       struct kempld_gpio_data *gpio = gpiochip_get_data(chip);
        struct kempld_device_data *pld = gpio->pld;
 
        return !kempld_gpio_get_bit(pld, KEMPLD_GPIO_DIR_NUM(offset), offset);
@@ -166,7 +161,7 @@ static int kempld_gpio_probe(struct platform_device *pdev)
        chip = &gpio->chip;
        chip->label = "gpio-kempld";
        chip->owner = THIS_MODULE;
-       chip->dev = dev;
+       chip->parent = dev;
        chip->can_sleep = true;
        if (pdata && pdata->gpio_base)
                chip->base = pdata->gpio_base;
@@ -183,7 +178,7 @@ static int kempld_gpio_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ret = gpiochip_add(chip);
+       ret = gpiochip_add_data(chip, gpio);
        if (ret) {
                dev_err(dev, "Could not register GPIO chip\n");
                return ret;