leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mfd: sm501: 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().

Cc: Ben Dooks <ben@fluff.org.uk>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Linus Walleij 2016-03-30 10:48:05 +02:00 committed by Lee Jones
parent ed1c9b3c18
commit 3a504105f0
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/mfd/sm501.c
View File

@ -879,11 +879,6 @@ static int sm501_register_display(struct sm501_devdata *sm,
#ifdef CONFIG_MFD_SM501_GPIO #ifdef CONFIG_MFD_SM501_GPIO
static inline struct sm501_gpio_chip *to_sm501_gpio(struct gpio_chip *gc)
{
return container_of(gc, struct sm501_gpio_chip, gpio);
}
static inline struct sm501_devdata *sm501_gpio_to_dev(struct sm501_gpio *gpio) static inline struct sm501_devdata *sm501_gpio_to_dev(struct sm501_gpio *gpio)
{ {
return container_of(gpio, struct sm501_devdata, gpio); return container_of(gpio, struct sm501_devdata, gpio);
@ -892,7 +887,7 @@ static inline struct sm501_devdata *sm501_gpio_to_dev(struct sm501_gpio *gpio)
static int sm501_gpio_get(struct gpio_chip *chip, unsigned offset) static int sm501_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct sm501_gpio_chip *smgpio = to_sm501_gpio(chip); struct sm501_gpio_chip *smgpio = gpiochip_get_data(chip);
unsigned long result; unsigned long result;
result = smc501_readl(smgpio->regbase + SM501_GPIO_DATA_LOW); result = smc501_readl(smgpio->regbase + SM501_GPIO_DATA_LOW);
@ -923,7 +918,7 @@ static void sm501_gpio_ensure_gpio(struct sm501_gpio_chip *smchip,
static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value) static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
{ {
struct sm501_gpio_chip *smchip = to_sm501_gpio(chip); struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
struct sm501_gpio *smgpio = smchip->ourgpio; struct sm501_gpio *smgpio = smchip->ourgpio;
unsigned long bit = 1 << offset; unsigned long bit = 1 << offset;
void __iomem *regs = smchip->regbase; void __iomem *regs = smchip->regbase;
@ -948,7 +943,7 @@ static void sm501_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset) static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
{ {
struct sm501_gpio_chip *smchip = to_sm501_gpio(chip); struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
struct sm501_gpio *smgpio = smchip->ourgpio; struct sm501_gpio *smgpio = smchip->ourgpio;
void __iomem *regs = smchip->regbase; void __iomem *regs = smchip->regbase;
unsigned long bit = 1 << offset; unsigned long bit = 1 << offset;
@ -974,7 +969,7 @@ static int sm501_gpio_input(struct gpio_chip *chip, unsigned offset)
static int sm501_gpio_output(struct gpio_chip *chip, static int sm501_gpio_output(struct gpio_chip *chip,
unsigned offset, int value) unsigned offset, int value)
{ {
struct sm501_gpio_chip *smchip = to_sm501_gpio(chip); struct sm501_gpio_chip *smchip = gpiochip_get_data(chip);
struct sm501_gpio *smgpio = smchip->ourgpio; struct sm501_gpio *smgpio = smchip->ourgpio;
unsigned long bit = 1 << offset; unsigned long bit = 1 << offset;
void __iomem *regs = smchip->regbase; void __iomem *regs = smchip->regbase;
@ -1039,7 +1034,7 @@ static int sm501_gpio_register_chip(struct sm501_devdata *sm,
gchip->base = base; gchip->base = base;
chip->ourgpio = gpio; chip->ourgpio = gpio;
return gpiochip_add(gchip); return gpiochip_add_data(gchip, chip);
} }
static int sm501_register_gpio(struct sm501_devdata *sm) static int sm501_register_gpio(struct sm501_devdata *sm)