Merge branch 'rcu-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / arch / powerpc / sysdev / ppc4xx_gpio.c

diff --git a/arch/powerpc/sysdev/ppc4xx_gpio.c b/arch/powerpc/sysdev/ppc4xx_gpio.c
index d7a7ef135b9fe918b9159b2a8ff59b0e1b69801e..5382d04dd8723f632ac781207da39be7f9f8704e 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_gpio.c
+++ b/arch/powerpc/sysdev/ppc4xx_gpio.c
@@ -27,7 +27,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/types.h>
 #include <linux/slab.h>
 
@@ -67,12 +67,6 @@ struct ppc4xx_gpio_chip {
  * There are a maximum of 32 gpios in each gpio controller.
  */
 
-static inline struct ppc4xx_gpio_chip *
-to_ppc4xx_gpiochip(struct of_mm_gpio_chip *mm_gc)
-{
-       return container_of(mm_gc, struct ppc4xx_gpio_chip, mm_gc);
-}
-
 static int ppc4xx_gpio_get(struct gpio_chip *gc, unsigned int gpio)
 {
        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
@@ -96,8 +90,7 @@ __ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 static void
 ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct ppc4xx_gpio_chip *chip = to_ppc4xx_gpiochip(mm_gc);
+       struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc);
        unsigned long flags;
 
        spin_lock_irqsave(&chip->lock, flags);
@@ -112,7 +105,7 @@ ppc4xx_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 static int ppc4xx_gpio_dir_in(struct gpio_chip *gc, unsigned int gpio)
 {
        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct ppc4xx_gpio_chip *chip = to_ppc4xx_gpiochip(mm_gc);
+       struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc);
        struct ppc4xx_gpio __iomem *regs = mm_gc->regs;
        unsigned long flags;
 
@@ -142,7 +135,7 @@ static int
 ppc4xx_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
        struct of_mm_gpio_chip *mm_gc = to_of_mm_gpio_chip(gc);
-       struct ppc4xx_gpio_chip *chip = to_ppc4xx_gpiochip(mm_gc);
+       struct ppc4xx_gpio_chip *chip = gpiochip_get_data(gc);
        struct ppc4xx_gpio __iomem *regs = mm_gc->regs;
        unsigned long flags;
 
@@ -200,7 +193,7 @@ static int __init ppc4xx_add_gpiochips(void)
                gc->get = ppc4xx_gpio_get;
                gc->set = ppc4xx_gpio_set;
 
-               ret = of_mm_gpiochip_add(np, mm_gc);
+               ret = of_mm_gpiochip_add_data(np, mm_gc, ppc4xx_gc);
                if (ret)
                        goto err;
                continue;