Commit 827c93da authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: meson: 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: Beniamino Galvani <b.galvani@gmail.com>
Cc: Carlo Caione <carlo@endlessm.com>
Cc: Antoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent acfd4c63

drivers/pinctrl/meson/pinctrl-meson.c

+6 −11
Original line number Diff line number Diff line
@@ -448,11 +448,6 @@ static const struct pinconf_ops meson_pinconf_ops = { 
	.is_generic		= true,

};



static inline struct meson_domain *to_meson_domain(struct gpio_chip *chip)

{

	return container_of(chip, struct meson_domain, chip);

}



static int meson_gpio_request(struct gpio_chip *chip, unsigned gpio)

{

	return pinctrl_request_gpio(chip->base + gpio);
@@ -460,14 +455,14 @@ static int meson_gpio_request(struct gpio_chip *chip, unsigned gpio) 


static void meson_gpio_free(struct gpio_chip *chip, unsigned gpio)

{

	struct meson_domain *domain = to_meson_domain(chip);

	struct meson_domain *domain = gpiochip_get_data(chip);



	pinctrl_free_gpio(domain->data->pin_base + gpio);

}



static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)

{

	struct meson_domain *domain = to_meson_domain(chip);

	struct meson_domain *domain = gpiochip_get_data(chip);

	unsigned int reg, bit, pin;

	struct meson_bank *bank;

	int ret;
@@ -485,7 +480,7 @@ static int meson_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) 
static int meson_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,

				       int value)

{

	struct meson_domain *domain = to_meson_domain(chip);

	struct meson_domain *domain = gpiochip_get_data(chip);

	unsigned int reg, bit, pin;

	struct meson_bank *bank;

	int ret;
@@ -507,7 +502,7 @@ static int meson_gpio_direction_output(struct gpio_chip *chip, unsigned gpio, 


static void meson_gpio_set(struct gpio_chip *chip, unsigned gpio, int value)

{

	struct meson_domain *domain = to_meson_domain(chip);

	struct meson_domain *domain = gpiochip_get_data(chip);

	unsigned int reg, bit, pin;

	struct meson_bank *bank;

	int ret;
@@ -524,7 +519,7 @@ static void meson_gpio_set(struct gpio_chip *chip, unsigned gpio, int value) 


static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)

{

	struct meson_domain *domain = to_meson_domain(chip);

	struct meson_domain *domain = gpiochip_get_data(chip);

	unsigned int reg, bit, val, pin;

	struct meson_bank *bank;

	int ret;
@@ -575,7 +570,7 @@ static int meson_gpiolib_register(struct meson_pinctrl *pc) 
		domain->chip.of_node = domain->of_node;

		domain->chip.of_gpio_n_cells = 2;



		ret = gpiochip_add(&domain->chip);

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

		if (ret) {

			dev_err(pc->dev, "can't add gpio chip %s\n",

				domain->data->name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE