Commit 2b016d27 authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: abx500: 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().

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 68ab0126

drivers/pinctrl/nomadik/pinctrl-abx500.c

+9 −18
Original line number Diff line number Diff line
@@ -109,19 +109,10 @@ struct abx500_pinctrl { 
	int irq_cluster_size;

};



/**

 * to_abx500_pinctrl() - get the pointer to abx500_pinctrl

 * @chip:	Member of the structure abx500_pinctrl

 */

static inline struct abx500_pinctrl *to_abx500_pinctrl(struct gpio_chip *chip)

{

	return container_of(chip, struct abx500_pinctrl, chip);

}



static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg,

			       unsigned offset, bool *bit)

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	u8 pos = offset % 8;

	u8 val;

	int ret;
@@ -143,7 +134,7 @@ static int abx500_gpio_get_bit(struct gpio_chip *chip, u8 reg, 
static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg,

				unsigned offset, int val)

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	u8 pos = offset % 8;

	int ret;
@@ -164,7 +155,7 @@ static int abx500_gpio_set_bits(struct gpio_chip *chip, u8 reg, 
 */

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

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	bool bit;

	bool is_out;

	u8 gpio_offset = offset - 1;
@@ -192,7 +183,7 @@ out: 


static void abx500_gpio_set(struct gpio_chip *chip, unsigned offset, int val)

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	int ret;



	ret = abx500_gpio_set_bits(chip, AB8500_GPIO_OUT1_REG, offset, val);
@@ -272,7 +263,7 @@ out: 


static bool abx500_pullud_supported(struct gpio_chip *chip, unsigned gpio)

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	struct pullud *pullud = pct->soc->pullud;



	return (pullud &&
@@ -284,7 +275,7 @@ static int abx500_gpio_direction_output(struct gpio_chip *chip, 
					unsigned offset,

					int val)

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	unsigned gpio;

	int ret;
@@ -332,7 +323,7 @@ static int abx500_gpio_direction_input(struct gpio_chip *chip, unsigned offset) 


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

{

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	/* The AB8500 GPIO numbers are off by one */

	int gpio = offset + 1;

	int hwirq;
@@ -634,7 +625,7 @@ static void abx500_gpio_dbg_show(struct seq_file *s, struct gpio_chip *chip) 
{

	unsigned i;

	unsigned gpio = chip->base;

	struct abx500_pinctrl *pct = to_abx500_pinctrl(chip);

	struct abx500_pinctrl *pct = gpiochip_get_data(chip);

	struct pinctrl_dev *pctldev = pct->pctldev;



	for (i = 0; i < chip->ngpio; i++, gpio++) {
@@ -1211,7 +1202,7 @@ static int abx500_gpio_probe(struct platform_device *pdev) 
	pct->irq_cluster = pct->soc->gpio_irq_cluster;

	pct->irq_cluster_size = pct->soc->ngpio_irq_cluster;



	ret = gpiochip_add(&pct->chip);

	ret = gpiochip_add_data(&pct->chip, pct);

	if (ret) {

		dev_err(&pdev->dev, "unable to add gpiochip: %d\n", ret);

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE