From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
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>,
Michael Hennerich <michael.hennerich@analog.com>
Subject: Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
Date: Wed, 16 Dec 2015 14:07:59 -0800 [thread overview]
Message-ID: <20151216220759.GC10962@dtor-ws> (raw)
In-Reply-To: <1449668710-5785-1-git-send-email-linus.walleij@linaro.org>
On Wed, Dec 09, 2015 at 02:45:10PM +0100, 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: Michael Hennerich <michael.hennerich@analog.com>
> Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Dmitry: please ACK this so I can take it through the GPIO tree.
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> drivers/input/keyboard/adp5589-keys.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
> index 4d446d5085aa..0b72345cf7b6 100644
> --- a/drivers/input/keyboard/adp5589-keys.c
> +++ b/drivers/input/keyboard/adp5589-keys.c
> @@ -387,7 +387,7 @@ static int adp5589_write(struct i2c_client *client, u8 reg, u8 val)
> #ifdef CONFIG_GPIOLIB
> static int adp5589_gpio_get_value(struct gpio_chip *chip, unsigned off)
> {
> - struct adp5589_kpad *kpad = container_of(chip, struct adp5589_kpad, gc);
> + struct adp5589_kpad *kpad = gpiochip_get_data(chip);
> unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
> unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
>
> @@ -399,7 +399,7 @@ static int adp5589_gpio_get_value(struct gpio_chip *chip, unsigned off)
> static void adp5589_gpio_set_value(struct gpio_chip *chip,
> unsigned off, int val)
> {
> - struct adp5589_kpad *kpad = container_of(chip, struct adp5589_kpad, gc);
> + struct adp5589_kpad *kpad = gpiochip_get_data(chip);
> unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
> unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
>
> @@ -418,7 +418,7 @@ static void adp5589_gpio_set_value(struct gpio_chip *chip,
>
> static int adp5589_gpio_direction_input(struct gpio_chip *chip, unsigned off)
> {
> - struct adp5589_kpad *kpad = container_of(chip, struct adp5589_kpad, gc);
> + struct adp5589_kpad *kpad = gpiochip_get_data(chip);
> unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
> unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
> int ret;
> @@ -438,7 +438,7 @@ static int adp5589_gpio_direction_input(struct gpio_chip *chip, unsigned off)
> static int adp5589_gpio_direction_output(struct gpio_chip *chip,
> unsigned off, int val)
> {
> - struct adp5589_kpad *kpad = container_of(chip, struct adp5589_kpad, gc);
> + struct adp5589_kpad *kpad = gpiochip_get_data(chip);
> unsigned int bank = kpad->var->bank(kpad->gpiomap[off]);
> unsigned int bit = kpad->var->bit(kpad->gpiomap[off]);
> int ret;
> @@ -525,7 +525,7 @@ static int adp5589_gpio_add(struct adp5589_kpad *kpad)
>
> mutex_init(&kpad->gpio_lock);
>
> - error = gpiochip_add(&kpad->gc);
> + error = gpiochip_add_data(&kpad->gc, kpad);
> if (error) {
> dev_err(dev, "gpiochip_add failed, err: %d\n", error);
> return error;
> --
> 2.4.3
>
--
Dmitry
prev parent reply other threads:[~2015-12-16 22:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:45 [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer Linus Walleij
2015-12-09 13:43 ` Michael Hennerich
2015-12-09 13:43 ` Michael Hennerich
2015-12-09 23:47 ` Michael Welling
2015-12-13 21:00 ` Linus Walleij
2015-12-16 22:07 ` Dmitry Torokhov [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=20151216220759.GC10962@dtor-ws \
--to=dmitry.torokhov@gmail.com \
--cc=acourbot@nvidia.com \
--cc=johan@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=michael.hennerich@analog.com \
--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).