* [PATCH 050/182] gpio: pch: use gpiochip data pointer
@ 2015-12-09 13:19 Linus Walleij
2015-12-14 12:07 ` Jean Delvare
2016-01-04 8:55 ` Jean Delvare
0 siblings, 2 replies; 4+ messages in thread
From: Linus Walleij @ 2015-12-09 13:19 UTC (permalink / raw)
To: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann
Cc: Linus Walleij, Thierry Reding, Daniel Krueger, Jean Delvare
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: Thierry Reding <treding@nvidia.com>
Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
Cc: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
drivers/gpio/gpio-pch.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
index e43db64e52b3..9349351afb47 100644
--- a/drivers/gpio/gpio-pch.c
+++ b/drivers/gpio/gpio-pch.c
@@ -109,7 +109,7 @@ struct pch_gpio {
static void pch_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
{
u32 reg_val;
- struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
+ struct pch_gpio *chip = gpiochip_get_data(gpio);
unsigned long flags;
spin_lock_irqsave(&chip->spinlock, flags);
@@ -125,7 +125,7 @@ static void pch_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
static int pch_gpio_get(struct gpio_chip *gpio, unsigned nr)
{
- struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
+ struct pch_gpio *chip = gpiochip_get_data(gpio);
return ioread32(&chip->reg->pi) & (1 << nr);
}
@@ -133,7 +133,7 @@ static int pch_gpio_get(struct gpio_chip *gpio, unsigned nr)
static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
int val)
{
- struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
+ struct pch_gpio *chip = gpiochip_get_data(gpio);
u32 pm;
u32 reg_val;
unsigned long flags;
@@ -158,7 +158,7 @@ static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
static int pch_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
{
- struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
+ struct pch_gpio *chip = gpiochip_get_data(gpio);
u32 pm;
unsigned long flags;
@@ -211,7 +211,7 @@ static void pch_gpio_restore_reg_conf(struct pch_gpio *chip)
static int pch_gpio_to_irq(struct gpio_chip *gpio, unsigned offset)
{
- struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
+ struct pch_gpio *chip = gpiochip_get_data(gpio);
return chip->irq_base + offset;
}
@@ -394,7 +394,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
pci_set_drvdata(pdev, chip);
spin_lock_init(&chip->spinlock);
pch_gpio_setup(chip);
- ret = gpiochip_add(&chip->gpio);
+ ret = gpiochip_add_data(&chip->gpio, chip);
if (ret) {
dev_err(&pdev->dev, "PCH gpio: Failed to register GPIO\n");
goto err_gpiochip_add;
--
2.4.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 050/182] gpio: pch: use gpiochip data pointer
2015-12-09 13:19 [PATCH 050/182] gpio: pch: use gpiochip data pointer Linus Walleij
@ 2015-12-14 12:07 ` Jean Delvare
2015-12-15 13:02 ` Linus Walleij
2016-01-04 8:55 ` Jean Delvare
1 sibling, 1 reply; 4+ messages in thread
From: Jean Delvare @ 2015-12-14 12:07 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann, Thierry Reding, Daniel Krueger
Hi Linus,
On Wed, 9 Dec 2015 14:19:48 +0100, Linus Walleij 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: Thierry Reding <treding@nvidia.com>
> Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
> Cc: Jean Delvare <jdelvare@suse.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/gpio/gpio-pch.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpio/gpio-pch.c b/drivers/gpio/gpio-pch.c
> index e43db64e52b3..9349351afb47 100644
> --- a/drivers/gpio/gpio-pch.c
> +++ b/drivers/gpio/gpio-pch.c
> @@ -109,7 +109,7 @@ struct pch_gpio {
> static void pch_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
> {
> u32 reg_val;
> - struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
> + struct pch_gpio *chip = gpiochip_get_data(gpio);
> unsigned long flags;
>
> spin_lock_irqsave(&chip->spinlock, flags);
> @@ -125,7 +125,7 @@ static void pch_gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
>
> static int pch_gpio_get(struct gpio_chip *gpio, unsigned nr)
> {
> - struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
> + struct pch_gpio *chip = gpiochip_get_data(gpio);
>
> return ioread32(&chip->reg->pi) & (1 << nr);
> }
> @@ -133,7 +133,7 @@ static int pch_gpio_get(struct gpio_chip *gpio, unsigned nr)
> static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
> int val)
> {
> - struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
> + struct pch_gpio *chip = gpiochip_get_data(gpio);
> u32 pm;
> u32 reg_val;
> unsigned long flags;
> @@ -158,7 +158,7 @@ static int pch_gpio_direction_output(struct gpio_chip *gpio, unsigned nr,
>
> static int pch_gpio_direction_input(struct gpio_chip *gpio, unsigned nr)
> {
> - struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
> + struct pch_gpio *chip = gpiochip_get_data(gpio);
> u32 pm;
> unsigned long flags;
>
> @@ -211,7 +211,7 @@ static void pch_gpio_restore_reg_conf(struct pch_gpio *chip)
>
> static int pch_gpio_to_irq(struct gpio_chip *gpio, unsigned offset)
> {
> - struct pch_gpio *chip = container_of(gpio, struct pch_gpio, gpio);
> + struct pch_gpio *chip = gpiochip_get_data(gpio);
> return chip->irq_base + offset;
> }
>
> @@ -394,7 +394,7 @@ static int pch_gpio_probe(struct pci_dev *pdev,
> pci_set_drvdata(pdev, chip);
> spin_lock_init(&chip->spinlock);
> pch_gpio_setup(chip);
> - ret = gpiochip_add(&chip->gpio);
> + ret = gpiochip_add_data(&chip->gpio, chip);
> if (ret) {
> dev_err(&pdev->dev, "PCH gpio: Failed to register GPIO\n");
> goto err_gpiochip_add;
Looks good, although I can't test it without patches 001 and 002, which
were not sent to me and are only archived by the download-unfriendly
gmane.
--
Jean Delvare
SUSE L3 Support
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 050/182] gpio: pch: use gpiochip data pointer
2015-12-14 12:07 ` Jean Delvare
@ 2015-12-15 13:02 ` Linus Walleij
0 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2015-12-15 13:02 UTC (permalink / raw)
To: Jean Delvare
Cc: linux-gpio@vger.kernel.org, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Thierry Reding, Daniel Krueger
On Mon, Dec 14, 2015 at 1:07 PM, Jean Delvare <jdelvare@suse.de> wrote:
> Looks good, although I can't test it without patches 001 and 002, which
> were not sent to me and are only archived by the download-unfriendly
> gmane.
Oopsie. I should have mentioned: you can pull the entire branch from
here:
https://git.kernel.org/cgit/linux/kernel/git/linusw/linux-gpio.git/log/?h=set-get-data
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 050/182] gpio: pch: use gpiochip data pointer
2015-12-09 13:19 [PATCH 050/182] gpio: pch: use gpiochip data pointer Linus Walleij
2015-12-14 12:07 ` Jean Delvare
@ 2016-01-04 8:55 ` Jean Delvare
1 sibling, 0 replies; 4+ messages in thread
From: Jean Delvare @ 2016-01-04 8:55 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann, Thierry Reding, Daniel Krueger
Hi Linus,
On Wed, 9 Dec 2015 14:19:48 +0100, Linus Walleij 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: Thierry Reding <treding@nvidia.com>
> Cc: Daniel Krueger <daniel.krueger@systec-electronic.com>
> Cc: Jean Delvare <jdelvare@suse.de>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> drivers/gpio/gpio-pch.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
> (...)
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Thanks,
--
Jean Delvare
SUSE L3 Support
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-04 8:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 13:19 [PATCH 050/182] gpio: pch: use gpiochip data pointer Linus Walleij
2015-12-14 12:07 ` Jean Delvare
2015-12-15 13:02 ` Linus Walleij
2016-01-04 8:55 ` Jean Delvare
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).