Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 22:02:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

gpio: tps65912: fix wrong container_of arguments

Browse Source 
The gpio_chip operations receive a pointer the gpio_chip struct which is
contained in the driver's private struct, yet the container_of call in those
functions point to the mfd struct defined in include/linux/mfd/tps65912.h.

Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Nicolas Saenz Julienne <nicolassaenzj@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Nicolas Saenz Julienne 2015-02-19 01:52:25 +00:00 committed by Linus Walleij
parent 9cf75e9e4d
commit 2f97c20e5f
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,9 +26,12 @@ 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 *tps65912 = container_of(gc, struct tps65912, gpio); struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912;
int val; int val;
val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset); val = tps65912_reg_read(tps65912, TPS65912_GPIO1 + offset);
@ -42,7 +45,8 @@ 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 *tps65912 = container_of(gc, struct tps65912, gpio); struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912;
if (value) if (value)
tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset, tps65912_set_bits(tps65912, TPS65912_GPIO1 + offset,
@ -55,7 +59,8 @@ 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 *tps65912 = container_of(gc, struct tps65912, gpio); struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912;
/* Set the initial value */ /* Set the initial value */
tps65912_gpio_set(gc, offset, value); tps65912_gpio_set(gc, offset, value);
@ -66,7 +71,8 @@ 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 *tps65912 = container_of(gc, struct tps65912, gpio); struct tps65912_gpio_data *tps65912_gpio = to_tgd(gc);
struct tps65912 *tps65912 = tps65912_gpio->tps65912;
return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset, return tps65912_clear_bits(tps65912, TPS65912_GPIO1 + offset,
GPIO_CFG_MASK); GPIO_CFG_MASK);