mfd: tps65010: 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(). Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
parent
4e125f62b7
commit
22e5e747e7
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
#include <linux/i2c/tps65010.h>
|
#include <linux/i2c/tps65010.h>
|
||||||
|
|
||||||
#include <linux/gpio.h>
|
#include <linux/gpio/driver.h>
|
||||||
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
@ -477,7 +477,7 @@ tps65010_output(struct gpio_chip *chip, unsigned offset, int value)
|
||||||
if (offset < 4) {
|
if (offset < 4) {
|
||||||
struct tps65010 *tps;
|
struct tps65010 *tps;
|
||||||
|
|
||||||
tps = container_of(chip, struct tps65010, chip);
|
tps = gpiochip_get_data(chip);
|
||||||
if (!(tps->outmask & (1 << offset)))
|
if (!(tps->outmask & (1 << offset)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
tps65010_set_gpio_out_value(offset + 1, value);
|
tps65010_set_gpio_out_value(offset + 1, value);
|
||||||
|
@ -494,7 +494,7 @@ static int tps65010_gpio_get(struct gpio_chip *chip, unsigned offset)
|
||||||
int value;
|
int value;
|
||||||
struct tps65010 *tps;
|
struct tps65010 *tps;
|
||||||
|
|
||||||
tps = container_of(chip, struct tps65010, chip);
|
tps = gpiochip_get_data(chip);
|
||||||
|
|
||||||
if (offset < 4) {
|
if (offset < 4) {
|
||||||
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
|
value = i2c_smbus_read_byte_data(tps->client, TPS_DEFGPIO);
|
||||||
|
@ -651,7 +651,7 @@ static int tps65010_probe(struct i2c_client *client,
|
||||||
tps->chip.ngpio = 7;
|
tps->chip.ngpio = 7;
|
||||||
tps->chip.can_sleep = 1;
|
tps->chip.can_sleep = 1;
|
||||||
|
|
||||||
status = gpiochip_add(&tps->chip);
|
status = gpiochip_add_data(&tps->chip, tps);
|
||||||
if (status < 0)
|
if (status < 0)
|
||||||
dev_err(&client->dev, "can't add gpiochip, err %d\n",
|
dev_err(&client->dev, "can't add gpiochip, err %d\n",
|
||||||
status);
|
status);
|
||||||
|
|
Loading…
Reference in New Issue