Commit 88057d6e authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: sunxi: 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: Chen-Yu Tsai <wens@csie.org>
Acked-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 9f57f81c

drivers/pinctrl/sunxi/pinctrl-sunxi.c

+5 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <linux/io.h>

#include <linux/clk.h>

#include <linux/gpio.h>

#include <linux/gpio/driver.h>

#include <linux/irqdomain.h>

#include <linux/irqchip/chained_irq.h>

#include <linux/module.h>
@@ -454,7 +454,7 @@ static int sunxi_pinctrl_gpio_direction_input(struct gpio_chip *chip, 


static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	struct sunxi_pinctrl *pctl = dev_get_drvdata(chip->parent);

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);

	u32 reg = sunxi_data_reg(offset);

	u8 index = sunxi_data_offset(offset);

	u32 set_mux = pctl->desc->irq_read_needs_mux &&
@@ -475,7 +475,7 @@ static int sunxi_pinctrl_gpio_get(struct gpio_chip *chip, unsigned offset) 
static void sunxi_pinctrl_gpio_set(struct gpio_chip *chip,

				unsigned offset, int value)

{

	struct sunxi_pinctrl *pctl = dev_get_drvdata(chip->parent);

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);

	u32 reg = sunxi_data_reg(offset);

	u8 index = sunxi_data_offset(offset);

	unsigned long flags;
@@ -522,7 +522,7 @@ static int sunxi_pinctrl_gpio_of_xlate(struct gpio_chip *gc, 


static int sunxi_pinctrl_gpio_to_irq(struct gpio_chip *chip, unsigned offset)

{

	struct sunxi_pinctrl *pctl = dev_get_drvdata(chip->parent);

	struct sunxi_pinctrl *pctl = gpiochip_get_data(chip);

	struct sunxi_desc_function *desc;

	unsigned pinnum = pctl->desc->pin_base + offset;

	unsigned irqnum;
@@ -962,7 +962,7 @@ int sunxi_pinctrl_init(struct platform_device *pdev, 
	pctl->chip->parent = &pdev->dev;

	pctl->chip->base = pctl->desc->pin_base;



	ret = gpiochip_add(pctl->chip);

	ret = gpiochip_add_data(pctl->chip, pctl);

	if (ret)

		goto pinctrl_error;

CRA Git | Maintained and supported by SUSTech CRA and CCSE