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>,
Dmitry Baryshkov <dbaryshkov@gmail.com>
Subject: Re: [PATCH 166/182] mfd: tc6393xb: use gpiochip data pointer
Date: Thu, 10 Dec 2015 10:35:21 +0000 [thread overview]
Message-ID: <20151210103521.GK17876@x1> (raw)
In-Reply-To: <1449668880-6404-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>
> Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Lee please ACK this so I can take it through the GPIO tree.
> ---
> drivers/mfd/tc6393xb.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
Acked-by: Lee Jones <lee.jones@linaro.org>
> diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
> index 8c84a513016b..a5253f9a5089 100644
> --- a/drivers/mfd/tc6393xb.c
> +++ b/drivers/mfd/tc6393xb.c
> @@ -24,7 +24,7 @@
> #include <linux/mfd/core.h>
> #include <linux/mfd/tmio.h>
> #include <linux/mfd/tc6393xb.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/driver.h>
> #include <linux/slab.h>
>
> #define SCR_REVID 0x08 /* b Revision ID */
> @@ -434,7 +434,7 @@ static struct mfd_cell tc6393xb_cells[] = {
> static int tc6393xb_gpio_get(struct gpio_chip *chip,
> unsigned offset)
> {
> - struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);
> + struct tc6393xb *tc6393xb = gpiochip_get_data(chip);
>
> /* XXX: does dsr also represent inputs? */
> return tmio_ioread8(tc6393xb->scr + SCR_GPO_DSR(offset / 8))
> @@ -444,7 +444,7 @@ static int tc6393xb_gpio_get(struct gpio_chip *chip,
> static void __tc6393xb_gpio_set(struct gpio_chip *chip,
> unsigned offset, int value)
> {
> - struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);
> + struct tc6393xb *tc6393xb = gpiochip_get_data(chip);
> u8 dsr;
>
> dsr = tmio_ioread8(tc6393xb->scr + SCR_GPO_DSR(offset / 8));
> @@ -459,7 +459,7 @@ static void __tc6393xb_gpio_set(struct gpio_chip *chip,
> static void tc6393xb_gpio_set(struct gpio_chip *chip,
> unsigned offset, int value)
> {
> - struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);
> + struct tc6393xb *tc6393xb = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&tc6393xb->lock, flags);
> @@ -472,7 +472,7 @@ static void tc6393xb_gpio_set(struct gpio_chip *chip,
> static int tc6393xb_gpio_direction_input(struct gpio_chip *chip,
> unsigned offset)
> {
> - struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);
> + struct tc6393xb *tc6393xb = gpiochip_get_data(chip);
> unsigned long flags;
> u8 doecr;
>
> @@ -490,7 +490,7 @@ static int tc6393xb_gpio_direction_input(struct gpio_chip *chip,
> static int tc6393xb_gpio_direction_output(struct gpio_chip *chip,
> unsigned offset, int value)
> {
> - struct tc6393xb *tc6393xb = container_of(chip, struct tc6393xb, gpio);
> + struct tc6393xb *tc6393xb = gpiochip_get_data(chip);
> unsigned long flags;
> u8 doecr;
>
> @@ -517,7 +517,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)
> tc6393xb->gpio.direction_input = tc6393xb_gpio_direction_input;
> tc6393xb->gpio.direction_output = tc6393xb_gpio_direction_output;
>
> - return gpiochip_add(&tc6393xb->gpio);
> + return gpiochip_add_data(&tc6393xb->gpio, tc6393xb);
> }
>
> /*--------------------------------------------------------------------------*/
--
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:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:48 [PATCH 166/182] mfd: tc6393xb: use gpiochip data pointer Linus Walleij
2015-12-10 10:35 ` 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=20151210103521.GK17876@x1 \
--to=lee.jones@linaro.org \
--cc=acourbot@nvidia.com \
--cc=dbaryshkov@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).