hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gpio: tps65912: 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: Nicolas Saenz Julienne <nicolassaenzj@gmail.com>
Cc: Margarita Olaya <magi@slimlogic.co.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 14:50:42 +01:00
parent b7c17b1b97
commit ad8dd23c45
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpio/gpio-tps65912.c
View File

@ -26,11 +26,9 @@ struct tps65912_gpio_data {
struct gpio_chip gpio_chip; struct gpio_chip gpio_chip;
}; };
#define to_tgd(gc) container_of(gc, struct tps65912_gpio_data, gpio_chip)
static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset) static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)
{ {
struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912; struct tps65912 *tps65912 = tps65912_gpio->tps65912;
int val; int val;
@ -45,7 +43,7 @@ static int tps65912_gpio_get(struct gpio_chip *gc, unsigned offset)
static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset, static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,
int value) int value)
{ {
struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912; struct tps65912 *tps65912 = tps65912_gpio->tps65912;
if (value) if (value)
@ -59,7 +57,7 @@ static void tps65912_gpio_set(struct gpio_chip *gc, unsigned offset,
static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset, static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset,
int value) int value)
{ {
struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912; struct tps65912 *tps65912 = tps65912_gpio->tps65912;
/* Set the initial value */ /* Set the initial value */
@ -71,7 +69,7 @@ static int tps65912_gpio_output(struct gpio_chip *gc, unsigned offset,
static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset) static int tps65912_gpio_input(struct gpio_chip *gc, unsigned offset)
{ {
struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc); struct tps65912_gpio_data *tps65912_gpio = gpiochip_get_data(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912; struct tps65912 *tps65912 = tps65912_gpio->tps65912;
return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
@ -108,7 +106,7 @@ static int tps65912_gpio_probe(struct platform_device *pdev)
if (pdata && pdata->gpio_base) if (pdata && pdata->gpio_base)
tps65912_gpio->gpio_chip.base = pdata->gpio_base; tps65912_gpio->gpio_chip.base = pdata->gpio_base;
ret = gpiochip_add(&tps65912_gpio->gpio_chip); ret = gpiochip_add_data(&tps65912_gpio->gpio_chip, tps65912_gpio);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret); dev_err(&pdev->dev, "Failed to register gpiochip, %d\n", ret);
return ret; return ret;