Merge tag 'linux-kselftest-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/gpio/gpio-wm8994.c b/drivers/gpio/gpio-wm8994.c
index 6f5e42db4b9e30f8a4254b3c68b66cd6d2a5b206..3ae4c15974942af790ed09dcea399d770482419e 100644 (file)
--- a/drivers/gpio/gpio-wm8994.c
+++ b/drivers/gpio/gpio-wm8994.c
@@ -31,14 +31,9 @@ struct wm8994_gpio {
        struct gpio_chip gpio_chip;
 };
 
-static inline struct wm8994_gpio *to_wm8994_gpio(struct gpio_chip *chip)
-{
-       return container_of(chip, struct wm8994_gpio, gpio_chip);
-}
-
 static int wm8994_gpio_request(struct gpio_chip *chip, unsigned offset)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
        switch (wm8994->type) {
@@ -61,7 +56,7 @@ static int wm8994_gpio_request(struct gpio_chip *chip, unsigned offset)
 
 static int wm8994_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
        return wm8994_set_bits(wm8994, WM8994_GPIO_1 + offset,
@@ -70,7 +65,7 @@ static int wm8994_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 
 static int wm8994_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
        int ret;
 
@@ -87,7 +82,7 @@ static int wm8994_gpio_get(struct gpio_chip *chip, unsigned offset)
 static int wm8994_gpio_direction_out(struct gpio_chip *chip,
                                     unsigned offset, int value)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
        if (value)
@@ -99,7 +94,7 @@ static int wm8994_gpio_direction_out(struct gpio_chip *chip,
 
 static void wm8994_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
        if (value)
@@ -110,7 +105,7 @@ static void wm8994_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 
 static int wm8994_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
 
        return regmap_irq_get_virq(wm8994->irq_data, offset);
@@ -174,7 +169,7 @@ static const char *wm8994_gpio_fn(u16 fn)
 
 static void wm8994_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
 {
-       struct wm8994_gpio *wm8994_gpio = to_wm8994_gpio(chip);
+       struct wm8994_gpio *wm8994_gpio = gpiochip_get_data(chip);
        struct wm8994 *wm8994 = wm8994_gpio->wm8994;
        int i;
 
@@ -260,13 +255,13 @@ static int wm8994_gpio_probe(struct platform_device *pdev)
        wm8994_gpio->wm8994 = wm8994;
        wm8994_gpio->gpio_chip = template_chip;
        wm8994_gpio->gpio_chip.ngpio = WM8994_GPIO_MAX;
-       wm8994_gpio->gpio_chip.dev = &pdev->dev;
+       wm8994_gpio->gpio_chip.parent = &pdev->dev;
        if (pdata && pdata->gpio_base)
                wm8994_gpio->gpio_chip.base = pdata->gpio_base;
        else
                wm8994_gpio->gpio_chip.base = -1;
 
-       ret = gpiochip_add(&wm8994_gpio->gpio_chip);
+       ret = gpiochip_add_data(&wm8994_gpio->gpio_chip, wm8994_gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpiochip, %d\n",
                        ret);