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

gpio: omap: 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: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-12-07 11:16:00 +01:00
parent f5cc554e1c
commit d99f7aec6e
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpio/gpio-omap.c
View File

@ -93,7 +93,7 @@ static void omap_gpio_unmask_irq(struct irq_data *d);
static inline struct gpio_bank *omap_irq_data_get_bank(struct irq_data *d) static inline struct gpio_bank *omap_irq_data_get_bank(struct irq_data *d)
{ {
struct gpio_chip *chip = irq_data_get_irq_chip_data(d); struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
return container_of(chip, struct gpio_bank, chip); return gpiochip_get_data(chip);
} }
static void omap_set_gpio_direction(struct gpio_bank *bank, int gpio, static void omap_set_gpio_direction(struct gpio_bank *bank, int gpio,
@ -661,7 +661,7 @@ static int omap_gpio_wake_enable(struct irq_data *d, unsigned int enable)
static int omap_gpio_request(struct gpio_chip *chip, unsigned offset) static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
{ {
struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip); struct gpio_bank *bank = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
/* /*
@ -681,7 +681,7 @@ static int omap_gpio_request(struct gpio_chip *chip, unsigned offset)
static void omap_gpio_free(struct gpio_chip *chip, unsigned offset) static void omap_gpio_free(struct gpio_chip *chip, unsigned offset)
{ {
struct gpio_bank *bank = container_of(chip, struct gpio_bank, chip); struct gpio_bank *bank = gpiochip_get_data(chip);
unsigned long flags; unsigned long flags;
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
@ -954,7 +954,7 @@ static int omap_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
void __iomem *reg; void __iomem *reg;
int dir; int dir;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
reg = bank->base + bank->regs->direction; reg = bank->base + bank->regs->direction;
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
dir = !!(readl_relaxed(reg) & BIT(offset)); dir = !!(readl_relaxed(reg) & BIT(offset));
@ -967,7 +967,7 @@ static int omap_gpio_input(struct gpio_chip *chip, unsigned offset)
struct gpio_bank *bank; struct gpio_bank *bank;
unsigned long flags; unsigned long flags;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
omap_set_gpio_direction(bank, offset, 1); omap_set_gpio_direction(bank, offset, 1);
raw_spin_unlock_irqrestore(&bank->lock, flags); raw_spin_unlock_irqrestore(&bank->lock, flags);
@ -978,7 +978,7 @@ static int omap_gpio_get(struct gpio_chip *chip, unsigned offset)
{ {
struct gpio_bank *bank; struct gpio_bank *bank;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
if (omap_gpio_is_input(bank, offset)) if (omap_gpio_is_input(bank, offset))
return omap_get_gpio_datain(bank, offset); return omap_get_gpio_datain(bank, offset);
@ -991,7 +991,7 @@ static int omap_gpio_output(struct gpio_chip *chip, unsigned offset, int value)
struct gpio_bank *bank; struct gpio_bank *bank;
unsigned long flags; unsigned long flags;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
bank->set_dataout(bank, offset, value); bank->set_dataout(bank, offset, value);
omap_set_gpio_direction(bank, offset, 0); omap_set_gpio_direction(bank, offset, 0);
@ -1005,7 +1005,7 @@ static int omap_gpio_debounce(struct gpio_chip *chip, unsigned offset,
struct gpio_bank *bank; struct gpio_bank *bank;
unsigned long flags; unsigned long flags;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
omap2_set_gpio_debounce(bank, offset, debounce); omap2_set_gpio_debounce(bank, offset, debounce);
@ -1019,7 +1019,7 @@ static void omap_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
struct gpio_bank *bank; struct gpio_bank *bank;
unsigned long flags; unsigned long flags;
bank = container_of(chip, struct gpio_bank, chip); bank = gpiochip_get_data(chip);
raw_spin_lock_irqsave(&bank->lock, flags); raw_spin_lock_irqsave(&bank->lock, flags);
bank->set_dataout(bank, offset, value); bank->set_dataout(bank, offset, value);
raw_spin_unlock_irqrestore(&bank->lock, flags); raw_spin_unlock_irqrestore(&bank->lock, flags);
@ -1098,7 +1098,7 @@ static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
} }
bank->chip.ngpio = bank->width; bank->chip.ngpio = bank->width;
ret = gpiochip_add(&bank->chip); ret = gpiochip_add_data(&bank->chip, bank);
if (ret) { if (ret) {
dev_err(bank->dev, "Could not register gpio chip %d\n", ret); dev_err(bank->dev, "Could not register gpio chip %d\n", ret);
return ret; return ret;