Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-microblaze.git] / drivers / tty / serial / sc16is7xx.c

diff --git a/drivers/tty/serial/sc16is7xx.c b/drivers/tty/serial/sc16is7xx.c
index 917504a..f36e6df 100644 (file)
--- a/drivers/tty/serial/sc16is7xx.c
+++ b/drivers/tty/serial/sc16is7xx.c
@@ -17,7 +17,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/device.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/i2c.h>
 #include <linux/module.h>
 #include <linux/of.h>
@@ -1097,8 +1097,7 @@ static const struct uart_ops sc16is7xx_ops = {
 static int sc16is7xx_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
        unsigned int val;
-       struct sc16is7xx_port *s = container_of(chip, struct sc16is7xx_port,
-                                               gpio);
+       struct sc16is7xx_port *s = gpiochip_get_data(chip);
        struct uart_port *port = &s->p[0].port;
 
        val = sc16is7xx_port_read(port, SC16IS7XX_IOSTATE_REG);
@@ -1108,8 +1107,7 @@ static int sc16is7xx_gpio_get(struct gpio_chip *chip, unsigned offset)
 
 static void sc16is7xx_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 {
-       struct sc16is7xx_port *s = container_of(chip, struct sc16is7xx_port,
-                                               gpio);
+       struct sc16is7xx_port *s = gpiochip_get_data(chip);
        struct uart_port *port = &s->p[0].port;
 
        sc16is7xx_port_update(port, SC16IS7XX_IOSTATE_REG, BIT(offset),
@@ -1119,8 +1117,7 @@ static void sc16is7xx_gpio_set(struct gpio_chip *chip, unsigned offset, int val)
 static int sc16is7xx_gpio_direction_input(struct gpio_chip *chip,
                                          unsigned offset)
 {
-       struct sc16is7xx_port *s = container_of(chip, struct sc16is7xx_port,
-                                               gpio);
+       struct sc16is7xx_port *s = gpiochip_get_data(chip);
        struct uart_port *port = &s->p[0].port;
 
        sc16is7xx_port_update(port, SC16IS7XX_IODIR_REG, BIT(offset), 0);
@@ -1131,8 +1128,7 @@ static int sc16is7xx_gpio_direction_input(struct gpio_chip *chip,
 static int sc16is7xx_gpio_direction_output(struct gpio_chip *chip,
                                           unsigned offset, int val)
 {
-       struct sc16is7xx_port *s = container_of(chip, struct sc16is7xx_port,
-                                               gpio);
+       struct sc16is7xx_port *s = gpiochip_get_data(chip);
        struct uart_port *port = &s->p[0].port;
 
        sc16is7xx_port_update(port, SC16IS7XX_IOSTATE_REG, BIT(offset),
@@ -1203,7 +1199,7 @@ static int sc16is7xx_probe(struct device *dev,
                s->gpio.base             = -1;
                s->gpio.ngpio            = devtype->nr_gpio;
                s->gpio.can_sleep        = 1;
-               ret = gpiochip_add(&s->gpio);
+               ret = gpiochip_add_data(&s->gpio, s);
                if (ret)
                        goto out_thread;
        }