serial: sc16is7xx: use gpiochip data pointer
This makes the driver use the data pointer added to the gpio_chip to store a pointer to the state container instead of relying on container_of(). Cc: Jiri Slaby <jslaby@suse.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
a00d60a0a2
commit
dee07cea54
|
@ -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>
|
||||
|
@ -1104,8 +1104,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);
|
||||
|
@ -1115,8 +1114,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),
|
||||
|
@ -1126,8 +1124,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);
|
||||
|
@ -1138,8 +1135,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),
|
||||
|
@ -1210,7 +1206,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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue