mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 01:40:30 +00:00
pinctrl: adi2: 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(). Acked-by: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
2b016d2793
commit
de3d851bea
@ -636,7 +636,7 @@ static int adi_pinmux_set(struct pinctrl_dev *pctldev, unsigned func_id,
|
||||
if (range == NULL) /* should not happen */
|
||||
return -ENODEV;
|
||||
|
||||
port = container_of(range->gc, struct gpio_port, chip);
|
||||
port = gpiochip_get_data(range->gc);
|
||||
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
|
||||
@ -684,7 +684,7 @@ static int adi_pinmux_request_gpio(struct pinctrl_dev *pctldev,
|
||||
unsigned long flags;
|
||||
u8 offset;
|
||||
|
||||
port = container_of(range->gc, struct gpio_port, chip);
|
||||
port = gpiochip_get_data(range->gc);
|
||||
offset = pin_to_offset(range, pin);
|
||||
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
@ -718,7 +718,7 @@ static int adi_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||
struct gpio_port *port;
|
||||
unsigned long flags;
|
||||
|
||||
port = container_of(chip, struct gpio_port, chip);
|
||||
port = gpiochip_get_data(chip);
|
||||
|
||||
spin_lock_irqsave(&port->lock, flags);
|
||||
|
||||
@ -733,7 +733,7 @@ static int adi_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
|
||||
static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
|
||||
int value)
|
||||
{
|
||||
struct gpio_port *port = container_of(chip, struct gpio_port, chip);
|
||||
struct gpio_port *port = gpiochip_get_data(chip);
|
||||
struct gpio_port_t *regs = port->regs;
|
||||
unsigned long flags;
|
||||
|
||||
@ -750,7 +750,7 @@ static void adi_gpio_set_value(struct gpio_chip *chip, unsigned offset,
|
||||
static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
||||
int value)
|
||||
{
|
||||
struct gpio_port *port = container_of(chip, struct gpio_port, chip);
|
||||
struct gpio_port *port = gpiochip_get_data(chip);
|
||||
struct gpio_port_t *regs = port->regs;
|
||||
unsigned long flags;
|
||||
|
||||
@ -770,7 +770,7 @@ static int adi_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
|
||||
|
||||
static int adi_gpio_get_value(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct gpio_port *port = container_of(chip, struct gpio_port, chip);
|
||||
struct gpio_port *port = gpiochip_get_data(chip);
|
||||
struct gpio_port_t *regs = port->regs;
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
@ -786,7 +786,7 @@ static int adi_gpio_get_value(struct gpio_chip *chip, unsigned offset)
|
||||
|
||||
static int adi_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
|
||||
{
|
||||
struct gpio_port *port = container_of(chip, struct gpio_port, chip);
|
||||
struct gpio_port *port = gpiochip_get_data(chip);
|
||||
|
||||
if (port->irq_base >= 0)
|
||||
return irq_find_mapping(port->domain, offset);
|
||||
@ -994,7 +994,7 @@ static int adi_gpio_probe(struct platform_device *pdev)
|
||||
port->chip.ngpio = port->width;
|
||||
gpio = port->chip.base + port->width;
|
||||
|
||||
ret = gpiochip_add(&port->chip);
|
||||
ret = gpiochip_add_data(&port->chip, port);
|
||||
if (ret) {
|
||||
dev_err(&pdev->dev, "Fail to add GPIO chip.\n");
|
||||
goto out_remove_domain;
|
||||
|
Loading…
Reference in New Issue
Block a user