gpio: mvebu: 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: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
parent
a772a26da7
commit
bbe760041a
|
@ -187,8 +187,7 @@ static void __iomem *mvebu_gpioreg_level_mask(struct mvebu_gpio_chip *mvchip)
|
|||
|
||||
static void mvebu_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
unsigned long flags;
|
||||
u32 u;
|
||||
|
||||
|
@ -204,8 +203,7 @@ static void mvebu_gpio_set(struct gpio_chip *chip, unsigned pin, int value)
|
|||
|
||||
static int mvebu_gpio_get(struct gpio_chip *chip, unsigned pin)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
u32 u;
|
||||
|
||||
if (readl_relaxed(mvebu_gpioreg_io_conf(mvchip)) & (1 << pin)) {
|
||||
|
@ -220,8 +218,7 @@ static int mvebu_gpio_get(struct gpio_chip *chip, unsigned pin)
|
|||
|
||||
static void mvebu_gpio_blink(struct gpio_chip *chip, unsigned pin, int value)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
unsigned long flags;
|
||||
u32 u;
|
||||
|
||||
|
@ -237,8 +234,7 @@ static void mvebu_gpio_blink(struct gpio_chip *chip, unsigned pin, int value)
|
|||
|
||||
static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
u32 u;
|
||||
|
@ -261,8 +257,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned pin)
|
|||
static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned pin,
|
||||
int value)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
unsigned long flags;
|
||||
int ret;
|
||||
u32 u;
|
||||
|
@ -287,8 +282,7 @@ static int mvebu_gpio_direction_output(struct gpio_chip *chip, unsigned pin,
|
|||
|
||||
static int mvebu_gpio_to_irq(struct gpio_chip *chip, unsigned pin)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
return irq_create_mapping(mvchip->domain, pin);
|
||||
}
|
||||
|
||||
|
@ -494,8 +488,7 @@ static void mvebu_gpio_irq_handler(struct irq_desc *desc)
|
|||
|
||||
static void mvebu_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip)
|
||||
{
|
||||
struct mvebu_gpio_chip *mvchip =
|
||||
container_of(chip, struct mvebu_gpio_chip, chip);
|
||||
struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip);
|
||||
u32 out, io_conf, blink, in_pol, data_in, cause, edg_msk, lvl_msk;
|
||||
int i;
|
||||
|
||||
|
@ -763,7 +756,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
|||
BUG();
|
||||
}
|
||||
|
||||
gpiochip_add(&mvchip->chip);
|
||||
gpiochip_add_data(&mvchip->chip, mvchip);
|
||||
|
||||
/* Some gpio controllers do not provide irq support */
|
||||
if (!of_irq_count(np))
|
||||
|
|
Loading…
Reference in New Issue