Message ID | 1449667881-2340-1-git-send-email-linus.walleij@linaro.org |
---|---|
State | New |
Headers | show |
Acked-by: Sonic Zhang <sonic.zhang@analog.com> On Wed, Dec 9, 2015 at 9:31 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > 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: Sonic Zhang <sonic.zhang@analog.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- > drivers/pinctrl/pinctrl-adi2.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c > index fd342dffe4dc..9ad1a8d29bbe 100644 > --- a/drivers/pinctrl/pinctrl-adi2.c > +++ b/drivers/pinctrl/pinctrl-adi2.c > @@ -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; > -- > 2.4.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-gpio" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pinctrl/pinctrl-adi2.c b/drivers/pinctrl/pinctrl-adi2.c index fd342dffe4dc..9ad1a8d29bbe 100644 --- a/drivers/pinctrl/pinctrl-adi2.c +++ b/drivers/pinctrl/pinctrl-adi2.c @@ -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;
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: Sonic Zhang <sonic.zhang@analog.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/pinctrl/pinctrl-adi2.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)