Skip to content

Commit

Permalink
mfd: tps65010: Use gpiochip data pointer
Browse files Browse the repository at this point in the history
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().

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
  • Loading branch information
Linus Walleij authored and Lee Jones committed Apr 19, 2016
1 parent 4e125f6 commit 22e5e74
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/mfd/tps65010.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#include <linux/i2c/tps65010.h>

#include <linux/gpio.h>
#include <linux/gpio/driver.h>


/*-------------------------------------------------------------------------*/
Expand Down Expand Up @@ -477,7 +477,7 @@ tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
if (offset < 4) {
struct tps65010 *tps;

tps = container_of(chip, struct tps65010, chip);
tps = gpiochip_get_data(chip);
if (!(tps->outmask & (1 << offset)))
return -EINVAL;
tps65010_set_gpio_out_value(offset + 1, value);
Expand All @@ -494,7 +494,7 @@ static int tps65010_gpio_get(struct gpio_chip *chip, unsigned offset)
int value;
struct tps65010 *tps;

tps = container_of(chip, struct tps65010, chip);
tps = gpiochip_get_data(chip);

if (offset < 4) {
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
Expand Down Expand Up @@ -651,7 +651,7 @@ static int tps65010_probe(struct i2c_client *client,
tps->chip.ngpio = 7;
tps->chip.can_sleep = 1;

status = gpiochip_add(&tps->chip);
status = gpiochip_add_data(&tps->chip, tps);
if (status < 0)
dev_err(&client->dev, "can't add gpiochip, err %d\n",
status);
Expand Down

0 comments on commit 22e5e74

Please sign in to comment.