* Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
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
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Michael Hennerich @ 2015-12-09 13:43 UTC (permalink / raw)
To: Linus Walleij, linux-gpio, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Dmitry Torokhov
On 12/09/2015 02:45 PM, 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>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
> Dmitry: please ACK this so I can take it through the GPIO tree.
> ---
> 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;
>
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
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-16 22:07 ` Dmitry Torokhov
3 siblings, 0 replies; 6+ messages in thread
From: Michael Hennerich @ 2015-12-09 13:43 UTC (permalink / raw)
To: Linus Walleij, linux-gpio, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Dmitry Torokhov
On 12/09/2015 02:45 PM, 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>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> ---
> Dmitry: please ACK this so I can take it through the GPIO tree.
> ---
> 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;
>
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
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
3 siblings, 1 reply; 6+ messages in thread
From: Michael Welling @ 2015-12-09 23:47 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio, Johan Hovold, Alexandre Courbot, Markus Pargmann,
Michael Hennerich, Dmitry Torokhov
On Wed, Dec 09, 2015 at 02:45:10PM +0100, Linus Walleij wrote:
> @@ -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);
Another dev_err referencing gpiochip_add instead of gpiochip_add_data.
> return error;
> --
> 2.4.3
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
2015-12-09 23:47 ` Michael Welling
@ 2015-12-13 21:00 ` Linus Walleij
0 siblings, 0 replies; 6+ messages in thread
From: Linus Walleij @ 2015-12-13 21:00 UTC (permalink / raw)
To: Michael Welling
Cc: linux-gpio@vger.kernel.org, Johan Hovold, Alexandre Courbot,
Markus Pargmann, Michael Hennerich, Dmitry Torokhov
On Thu, Dec 10, 2015 at 12:47 AM, Michael Welling <mwelling@ieee.org> wrote:
> On Wed, Dec 09, 2015 at 02:45:10PM +0100, Linus Walleij wrote:
>> @@ -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);
>
> Another dev_err referencing gpiochip_add instead of gpiochip_add_data.
I just went in and edited the commit. No other change so not resending,
OK?
First I thought this textstring thing was minor but now I'm fixing it up,
why not.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer
2015-12-09 13:45 [PATCH 156/182] input: adp5589-keys: use gpiochip data pointer Linus Walleij
` (2 preceding siblings ...)
2015-12-09 23:47 ` Michael Welling
@ 2015-12-16 22:07 ` Dmitry Torokhov
3 siblings, 0 replies; 6+ messages in thread
From: Dmitry Torokhov @ 2015-12-16 22:07 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann, Michael Hennerich
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
^ permalink raw reply [flat|nested] 6+ messages in thread