From: Alban <albeu@free.fr>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Alban <albeu@free.fr>,
linux-gpio@vger.kernel.org, Johan Hovold <johan@kernel.org>,
Alexandre Courbot <acourbot@nvidia.com>,
Michael Welling <mwelling@ieee.org>,
Markus Pargmann <mpa@pengutronix.de>
Subject: Re: [PATCH 015/182] gpio: ath79: use gpiochip data pointer
Date: Wed, 9 Dec 2015 14:51:42 +0100 [thread overview]
Message-ID: <20151209145142.2cdf7999@avionic-0020> (raw)
In-Reply-To: <1449666886-30451-1-git-send-email-linus.walleij@linaro.org>
On Wed, 9 Dec 2015 14:14:46 +0100
Linus Walleij <linus.walleij@linaro.org> wrote:
> 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: Alban Bedel <albeu@free.fr>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Alban Bedel <albeu@free.fr>
> ---
> drivers/gpio/gpio-ath79.c | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/gpio/gpio-ath79.c b/drivers/gpio/gpio-ath79.c
> index e7e38af11ec9..2c208e1d9350 100644
> --- a/drivers/gpio/gpio-ath79.c
> +++ b/drivers/gpio/gpio-ath79.c
> @@ -24,12 +24,10 @@ struct ath79_gpio_ctrl {
> spinlock_t lock;
> };
>
> -#define to_ath79_gpio_ctrl(c) container_of(c, struct ath79_gpio_ctrl, chip)
> -
> static void ath79_gpio_set_value(struct gpio_chip *chip,
> unsigned gpio, int value)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
>
> if (value)
> __raw_writel(BIT(gpio), ctrl->base + AR71XX_GPIO_REG_SET);
> @@ -39,7 +37,7 @@ static void ath79_gpio_set_value(struct gpio_chip *chip,
>
> static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
>
> return (__raw_readl(ctrl->base + AR71XX_GPIO_REG_IN) >> gpio) & 1;
> }
> @@ -47,7 +45,7 @@ static int ath79_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
> static int ath79_gpio_direction_input(struct gpio_chip *chip,
> unsigned offset)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ctrl->lock, flags);
> @@ -64,7 +62,7 @@ static int ath79_gpio_direction_input(struct gpio_chip *chip,
> static int ath79_gpio_direction_output(struct gpio_chip *chip,
> unsigned offset, int value)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ctrl->lock, flags);
> @@ -85,7 +83,7 @@ static int ath79_gpio_direction_output(struct gpio_chip *chip,
>
> static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ctrl->lock, flags);
> @@ -102,7 +100,7 @@ static int ar934x_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
> static int ar934x_gpio_direction_output(struct gpio_chip *chip, unsigned offset,
> int value)
> {
> - struct ath79_gpio_ctrl *ctrl = to_ath79_gpio_ctrl(chip);
> + struct ath79_gpio_ctrl *ctrl = gpiochip_get_data(chip);
> unsigned long flags;
>
> spin_lock_irqsave(&ctrl->lock, flags);
> @@ -184,7 +182,7 @@ static int ath79_gpio_probe(struct platform_device *pdev)
> ctrl->chip.direction_output = ar934x_gpio_direction_output;
> }
>
> - err = gpiochip_add(&ctrl->chip);
> + err = gpiochip_add_data(&ctrl->chip, ctrl);
> if (err) {
> dev_err(&pdev->dev,
> "cannot add AR71xx GPIO chip, error=%d", err);
prev parent reply other threads:[~2015-12-09 13:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-09 13:14 [PATCH 015/182] gpio: ath79: use gpiochip data pointer Linus Walleij
2015-12-09 13:51 ` Alban [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151209145142.2cdf7999@avionic-0020 \
--to=albeu@free.fr \
--cc=acourbot@nvidia.com \
--cc=johan@kernel.org \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=mpa@pengutronix.de \
--cc=mwelling@ieee.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).