From: Lee Jones <lee.jones@linaro.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: linux-gpio@vger.kernel.org, Johan Hovold <johan@kernel.org>,
Alexandre Courbot <acourbot@nvidia.com>,
Michael Welling <mwelling@ieee.org>,
Markus Pargmann <mpa@pengutronix.de>
Subject: Re: [PATCH 168/182] mfd: ucb1x00: use gpiochip data pointer
Date: Thu, 10 Dec 2015 10:34:43 +0000 [thread overview]
Message-ID: <20151210103443.GI17876@x1> (raw)
In-Reply-To: <1449668897-6498-1-git-send-email-linus.walleij@linaro.org>
On Wed, 09 Dec 2015, Linus Walleij 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: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Lee please ACK this so I can take it through the GPIO tree.
> ---
> drivers/mfd/ucb1x00-core.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
> index a6ec7cc0fac6..84d0757b8c5d 100644
> --- a/drivers/mfd/ucb1x00-core.c
> +++ b/drivers/mfd/ucb1x00-core.c
> @@ -28,7 +28,7 @@
> #include <linux/mutex.h>
> #include <linux/mfd/ucb1x00.h>
> #include <linux/pm.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/driver.h>
>
> static DEFINE_MUTEX(ucb1x00_mutex);
> static LIST_HEAD(ucb1x00_drivers);
> @@ -109,7 +109,7 @@ unsigned int ucb1x00_io_read(struct ucb1x00 *ucb)
>
> static void ucb1x00_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
> {
> - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
> + struct ucb1x00 *ucb = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ucb->io_lock, flags);
> @@ -126,7 +126,7 @@ static void ucb1x00_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
>
> static int ucb1x00_gpio_get(struct gpio_chip *chip, unsigned offset)
> {
> - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
> + struct ucb1x00 *ucb = gpiochip_get_data(chip);
> unsigned val;
>
> ucb1x00_enable(ucb);
> @@ -138,7 +138,7 @@ static int ucb1x00_gpio_get(struct gpio_chip *chip, unsigned offset)
>
> static int ucb1x00_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> {
> - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
> + struct ucb1x00 *ucb = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ucb->io_lock, flags);
> @@ -154,7 +154,7 @@ static int ucb1x00_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
> , int value)
> {
> - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
> + struct ucb1x00 *ucb = gpiochip_get_data(chip);
> unsigned long flags;
> unsigned old, mask = 1 << offset;
>
> @@ -181,7 +181,7 @@ static int ucb1x00_gpio_direction_output(struct gpio_chip *chip, unsigned offset
>
> static int ucb1x00_to_irq(struct gpio_chip *chip, unsigned offset)
> {
> - struct ucb1x00 *ucb = container_of(chip, struct ucb1x00, gpio);
> + struct ucb1x00 *ucb = gpiochip_get_data(chip);
>
> return ucb->irq_base > 0 ? ucb->irq_base + offset : -ENXIO;
> }
> @@ -579,7 +579,7 @@ static int ucb1x00_probe(struct mcp *mcp)
> ucb->gpio.direction_input = ucb1x00_gpio_direction_input;
> ucb->gpio.direction_output = ucb1x00_gpio_direction_output;
> ucb->gpio.to_irq = ucb1x00_to_irq;
> - ret = gpiochip_add(&ucb->gpio);
> + ret = gpiochip_add_data(&ucb->gpio, ucb);
> if (ret)
> goto err_gpio_add;
> } else
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
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
prev parent reply other threads:[~2015-12-10 10:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:48 [PATCH 168/182] mfd: ucb1x00: use gpiochip data pointer Linus Walleij
2015-12-10 10:34 ` Lee Jones [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151210103443.GI17876@x1 \
--to=lee.jones@linaro.org \
--cc=acourbot@nvidia.com \
--cc=johan@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mpa@pengutronix.de \
--cc=mwelling@ieee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.