Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d3baee37 authored by Linus Walleij's avatar Linus Walleij
Browse files

input: adp5588-keys: use gpiochip data pointer 



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>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Acked-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 59851aa8

drivers/input/keyboard/adp5588-keys.c

+5 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ static int adp5588_write(struct i2c_client *client, u8 reg, u8 val) 
#ifdef CONFIG_GPIOLIB

static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off)

{

	struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);

	struct adp5588_kpad *kpad = gpiochip_get_data(chip);

	unsigned int bank = ADP5588_BANK(kpad->gpiomap[off]);

	unsigned int bit = ADP5588_BIT(kpad->gpiomap[off]);

	int val;
@@ -93,7 +93,7 @@ static int adp5588_gpio_get_value(struct gpio_chip *chip, unsigned off) 
static void adp5588_gpio_set_value(struct gpio_chip *chip,

				   unsigned off, int val)

{

	struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);

	struct adp5588_kpad *kpad = gpiochip_get_data(chip);

	unsigned int bank = ADP5588_BANK(kpad->gpiomap[off]);

	unsigned int bit = ADP5588_BIT(kpad->gpiomap[off]);
@@ -112,7 +112,7 @@ static void adp5588_gpio_set_value(struct gpio_chip *chip, 


static int adp5588_gpio_direction_input(struct gpio_chip *chip, unsigned off)

{

	struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);

	struct adp5588_kpad *kpad = gpiochip_get_data(chip);

	unsigned int bank = ADP5588_BANK(kpad->gpiomap[off]);

	unsigned int bit = ADP5588_BIT(kpad->gpiomap[off]);

	int ret;
@@ -130,7 +130,7 @@ static int adp5588_gpio_direction_input(struct gpio_chip *chip, unsigned off) 
static int adp5588_gpio_direction_output(struct gpio_chip *chip,

					 unsigned off, int val)

{

	struct adp5588_kpad *kpad = container_of(chip, struct adp5588_kpad, gc);

	struct adp5588_kpad *kpad = gpiochip_get_data(chip);

	unsigned int bank = ADP5588_BANK(kpad->gpiomap[off]);

	unsigned int bit = ADP5588_BIT(kpad->gpiomap[off]);

	int ret;
@@ -210,7 +210,7 @@ static int adp5588_gpio_add(struct adp5588_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;