* [PATCH 015/182] gpio: ath79: use gpiochip data pointer
@ 2015-12-09 13:14 Linus Walleij
2015-12-09 13:51 ` Alban
0 siblings, 1 reply; 2+ messages in thread
From: Linus Walleij @ 2015-12-09 13:14 UTC (permalink / raw)
To: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann
Cc: Linus Walleij, Alban Bedel
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>
---
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);
--
2.4.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 015/182] gpio: ath79: use gpiochip data pointer
2015-12-09 13:14 [PATCH 015/182] gpio: ath79: use gpiochip data pointer Linus Walleij
@ 2015-12-09 13:51 ` Alban
0 siblings, 0 replies; 2+ messages in thread
From: Alban @ 2015-12-09 13:51 UTC (permalink / raw)
To: Linus Walleij
Cc: Alban, linux-gpio, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann
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);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-09 13:51 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 13:14 [PATCH 015/182] gpio: ath79: use gpiochip data pointer Linus Walleij
2015-12-09 13:51 ` Alban
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).