gpio: 74x164: 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: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-03 18:20:29 +01:00
parent d602ae90a3
commit b2afc6f352
1 changed files with 3 additions and 8 deletions

View File

@ -33,11 +33,6 @@ struct gen_74x164_chip {
u8 buffer[0]; u8 buffer[0];
}; };
static struct gen_74x164_chip *gpio_to_74x164_chip(struct gpio_chip *gc)
{
return container_of(gc, struct gen_74x164_chip, gpio_chip);
}
static int __gen_74x164_write_config(struct gen_74x164_chip *chip) static int __gen_74x164_write_config(struct gen_74x164_chip *chip)
{ {
struct spi_transfer xfer = { struct spi_transfer xfer = {
@ -51,7 +46,7 @@ static int __gen_74x164_write_config(struct gen_74x164_chip *chip)
static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset) static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset)
{ {
struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc); struct gen_74x164_chip *chip = gpiochip_get_data(gc);
u8 bank = chip->registers - 1 - offset / 8; u8 bank = chip->registers - 1 - offset / 8;
u8 pin = offset % 8; u8 pin = offset % 8;
int ret; int ret;
@ -66,7 +61,7 @@ static int gen_74x164_get_value(struct gpio_chip *gc, unsigned offset)
static void gen_74x164_set_value(struct gpio_chip *gc, static void gen_74x164_set_value(struct gpio_chip *gc,
unsigned offset, int val) unsigned offset, int val)
{ {
struct gen_74x164_chip *chip = gpio_to_74x164_chip(gc); struct gen_74x164_chip *chip = gpiochip_get_data(gc);
u8 bank = chip->registers - 1 - offset / 8; u8 bank = chip->registers - 1 - offset / 8;
u8 pin = offset % 8; u8 pin = offset % 8;
@ -136,7 +131,7 @@ static int gen_74x164_probe(struct spi_device *spi)
goto exit_destroy; goto exit_destroy;
} }
ret = gpiochip_add(&chip->gpio_chip); ret = gpiochip_add_data(&chip->gpio_chip, chip);
if (!ret) if (!ret)
return 0; return 0;