xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: tps65910: use gpiochip data pointer

Browse Source 
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().

Acked-By: Rhyland Klein <rklein@nvidia.com>
Acked-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij
2015-12-07 14:48:49 +01:00
parent 94a9037042
commit b7c17b1b97
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpio/gpio-tps65910.c
View File

@@ -27,14 +27,9 @@ struct tps65910_gpio {
struct tps65910 *tps65910; struct tps65910 *tps65910;
}; };
static inline struct tps65910_gpio *to_tps65910_gpio(struct gpio_chip *chip)
{
return container_of(chip, struct tps65910_gpio, gpio_chip);
}
static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset) static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset)
{ {
struct tps65910_gpio *tps65910_gpio = to_tps65910_gpio(gc); struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc);
struct tps65910 *tps65910 = tps65910_gpio->tps65910; struct tps65910 *tps65910 = tps65910_gpio->tps65910;
unsigned int val; unsigned int val;
@@ -49,7 +44,7 @@ static int tps65910_gpio_get(struct gpio_chip *gc, unsigned offset)
static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset, static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset,
int value) int value)
{ {
struct tps65910_gpio *tps65910_gpio = to_tps65910_gpio(gc); struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc);
struct tps65910 *tps65910 = tps65910_gpio->tps65910; struct tps65910 *tps65910 = tps65910_gpio->tps65910;
if (value) if (value)
@@ -63,7 +58,7 @@ static void tps65910_gpio_set(struct gpio_chip *gc, unsigned offset,
static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset, static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
int value) int value)
{ {
struct tps65910_gpio *tps65910_gpio = to_tps65910_gpio(gc); struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc);
struct tps65910 *tps65910 = tps65910_gpio->tps65910; struct tps65910 *tps65910 = tps65910_gpio->tps65910;
/* Set the initial value */ /* Set the initial value */
@@ -75,7 +70,7 @@ static int tps65910_gpio_output(struct gpio_chip *gc, unsigned offset,
static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset) static int tps65910_gpio_input(struct gpio_chip *gc, unsigned offset)
{ {
struct tps65910_gpio *tps65910_gpio = to_tps65910_gpio(gc); struct tps65910_gpio *tps65910_gpio = gpiochip_get_data(gc);
struct tps65910 *tps65910 = tps65910_gpio->tps65910; struct tps65910 *tps65910 = tps65910_gpio->tps65910;
return tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset, return tps65910_reg_clear_bits(tps65910, TPS65910_GPIO0 + offset,
@@ -175,7 +170,7 @@ static int tps65910_gpio_probe(struct platform_device *pdev)
} }
skip_init: skip_init:
ret = gpiochip_add(&tps65910_gpio->gpio_chip); ret = gpiochip_add_data(&tps65910_gpio->gpio_chip, tps65910_gpio);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret); dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
return ret; return ret;