* [PATCH 172/182] staging: vme: use gpiochip data pointer
@ 2015-12-09 13:50 Linus Walleij
2015-12-11 6:58 ` Martyn Welch
2016-02-08 4:08 ` Greg Kroah-Hartman
0 siblings, 2 replies; 5+ messages in thread
From: Linus Walleij @ 2015-12-09 13:50 UTC (permalink / raw)
To: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann, Greg Kroah-Hartman
Cc: Linus Walleij, Martyn Welch, Manohar Vanga, devel
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Martyn Welch <martyn@welchs.me.uk>
Cc: Manohar Vanga <manohar.vanga@gmail.com>
Cc: devel@driverdev.osuosl.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
Greg, please ACK this so I can take this through the GPIO tree.
---
drivers/staging/vme/devices/vme_pio2_gpio.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
index 77901b345a71..a2b740ab7ffe 100644
--- a/drivers/staging/vme/devices/vme_pio2_gpio.c
+++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
@@ -17,7 +17,7 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/ctype.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
#include <linux/slab.h>
#include <linux/vme.h>
@@ -25,16 +25,11 @@
static const char driver_name[] = "pio2_gpio";
-static struct pio2_card *gpio_to_pio2_card(struct gpio_chip *chip)
-{
- return container_of(chip, struct pio2_card, gc);
-}
-
static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
{
u8 reg;
int retval;
- struct pio2_card *card = gpio_to_pio2_card(chip);
+ struct pio2_card *card = gpiochip_get_data(chip);
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
@@ -72,7 +67,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
{
u8 reg;
int retval;
- struct pio2_card *card = gpio_to_pio2_card(chip);
+ struct pio2_card *card = gpiochip_get_data(chip);
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
@@ -102,7 +97,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
{
int data;
- struct pio2_card *card = gpio_to_pio2_card(chip);
+ struct pio2_card *card = gpiochip_get_data(chip);
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
@@ -121,7 +116,7 @@ static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
{
int data;
- struct pio2_card *card = gpio_to_pio2_card(chip);
+ struct pio2_card *card = gpiochip_get_data(chip);
if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
(card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
@@ -207,7 +202,7 @@ int pio2_gpio_init(struct pio2_card *card)
card->gc.set = pio2_gpio_set;
/* This function adds a memory mapped GPIO chip */
- retval = gpiochip_add(&(card->gc));
+ retval = gpiochip_add_data(&(card->gc), card);
if (retval) {
dev_err(&card->vdev->dev, "Unable to register GPIO\n");
kfree(card->gc.label);
--
2.4.3
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 172/182] staging: vme: use gpiochip data pointer
2015-12-09 13:50 [PATCH 172/182] staging: vme: use gpiochip data pointer Linus Walleij
@ 2015-12-11 6:58 ` Martyn Welch
2015-12-14 14:14 ` Linus Walleij
2016-02-08 4:08 ` Greg Kroah-Hartman
1 sibling, 1 reply; 5+ messages in thread
From: Martyn Welch @ 2015-12-11 6:58 UTC (permalink / raw)
To: Linus Walleij, linux-gpio, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Greg Kroah-Hartman
Cc: Manohar Vanga, devel
On 09/12/15 13:50, 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Martyn Welch <martyn@welchs.me.uk>
> Cc: Manohar Vanga <manohar.vanga@gmail.com>
> Cc: devel@driverdev.osuosl.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-of-by: Martyn Welch <martyn@welchs.me.uk>
> ---
> Greg, please ACK this so I can take this through the GPIO tree.
> ---
> drivers/staging/vme/devices/vme_pio2_gpio.c | 17 ++++++-----------
> 1 file changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/staging/vme/devices/vme_pio2_gpio.c b/drivers/staging/vme/devices/vme_pio2_gpio.c
> index 77901b345a71..a2b740ab7ffe 100644
> --- a/drivers/staging/vme/devices/vme_pio2_gpio.c
> +++ b/drivers/staging/vme/devices/vme_pio2_gpio.c
> @@ -17,7 +17,7 @@
> #include <linux/device.h>
> #include <linux/platform_device.h>
> #include <linux/ctype.h>
> -#include <linux/gpio.h>
> +#include <linux/gpio/driver.h>
> #include <linux/slab.h>
> #include <linux/vme.h>
>
> @@ -25,16 +25,11 @@
>
> static const char driver_name[] = "pio2_gpio";
>
> -static struct pio2_card *gpio_to_pio2_card(struct gpio_chip *chip)
> -{
> - return container_of(chip, struct pio2_card, gc);
> -}
> -
> static int pio2_gpio_get(struct gpio_chip *chip, unsigned int offset)
> {
> u8 reg;
> int retval;
> - struct pio2_card *card = gpio_to_pio2_card(chip);
> + struct pio2_card *card = gpiochip_get_data(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
> (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> @@ -72,7 +67,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
> {
> u8 reg;
> int retval;
> - struct pio2_card *card = gpio_to_pio2_card(chip);
> + struct pio2_card *card = gpiochip_get_data(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
> (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> @@ -102,7 +97,7 @@ static void pio2_gpio_set(struct gpio_chip *chip, unsigned int offset,
> static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
> {
> int data;
> - struct pio2_card *card = gpio_to_pio2_card(chip);
> + struct pio2_card *card = gpiochip_get_data(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == OUTPUT) |
> (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> @@ -121,7 +116,7 @@ static int pio2_gpio_dir_in(struct gpio_chip *chip, unsigned offset)
> static int pio2_gpio_dir_out(struct gpio_chip *chip, unsigned offset, int value)
> {
> int data;
> - struct pio2_card *card = gpio_to_pio2_card(chip);
> + struct pio2_card *card = gpiochip_get_data(chip);
>
> if ((card->bank[PIO2_CHANNEL_BANK[offset]].config == INPUT) |
> (card->bank[PIO2_CHANNEL_BANK[offset]].config == NOFIT)) {
> @@ -207,7 +202,7 @@ int pio2_gpio_init(struct pio2_card *card)
> card->gc.set = pio2_gpio_set;
>
> /* This function adds a memory mapped GPIO chip */
> - retval = gpiochip_add(&(card->gc));
> + retval = gpiochip_add_data(&(card->gc), card);
> if (retval) {
> dev_err(&card->vdev->dev, "Unable to register GPIO\n");
> kfree(card->gc.label);
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 172/182] staging: vme: use gpiochip data pointer
2015-12-11 6:58 ` Martyn Welch
@ 2015-12-14 14:14 ` Linus Walleij
2015-12-14 21:51 ` Martyn Welch
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2015-12-14 14:14 UTC (permalink / raw)
To: Martyn Welch
Cc: linux-gpio@vger.kernel.org, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Greg Kroah-Hartman,
Manohar Vanga, devel@driverdev.osuosl.org
On Fri, Dec 11, 2015 at 7:58 AM, Martyn Welch <martyn@welchs.me.uk> wrote:
> On 09/12/15 13:50, 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>> Cc: Martyn Welch <martyn@welchs.me.uk>
>> Cc: Manohar Vanga <manohar.vanga@gmail.com>
>> Cc: devel@driverdev.osuosl.org
>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>
>
> Signed-of-by: Martyn Welch <martyn@welchs.me.uk>
Signed-off is for the delivery path so I assume you meant
Acked-by and I added that.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 172/182] staging: vme: use gpiochip data pointer
2015-12-14 14:14 ` Linus Walleij
@ 2015-12-14 21:51 ` Martyn Welch
0 siblings, 0 replies; 5+ messages in thread
From: Martyn Welch @ 2015-12-14 21:51 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio@vger.kernel.org, Johan Hovold, Alexandre Courbot,
Michael Welling, Markus Pargmann, Greg Kroah-Hartman,
Manohar Vanga, devel@driverdev.osuosl.org
On 14/12/15 14:14, Linus Walleij wrote:
> On Fri, Dec 11, 2015 at 7:58 AM, Martyn Welch <martyn@welchs.me.uk> wrote:
>> On 09/12/15 13:50, 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>>> Cc: Martyn Welch <martyn@welchs.me.uk>
>>> Cc: Manohar Vanga <manohar.vanga@gmail.com>
>>> Cc: devel@driverdev.osuosl.org
>>> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
>>
>> Signed-of-by: Martyn Welch <martyn@welchs.me.uk>
> Signed-off is for the delivery path so I assume you meant
> Acked-by and I added that.
Yeah, no problem.
Martyn
> Yours,
> Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 172/182] staging: vme: use gpiochip data pointer
2015-12-09 13:50 [PATCH 172/182] staging: vme: use gpiochip data pointer Linus Walleij
2015-12-11 6:58 ` Martyn Welch
@ 2016-02-08 4:08 ` Greg Kroah-Hartman
1 sibling, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2016-02-08 4:08 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio, Johan Hovold, Alexandre Courbot, Michael Welling,
Markus Pargmann, Martyn Welch, Manohar Vanga, devel
On Wed, Dec 09, 2015 at 02:50:05PM +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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Martyn Welch <martyn@welchs.me.uk>
> Cc: Manohar Vanga <manohar.vanga@gmail.com>
> Cc: devel@driverdev.osuosl.org
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> Greg, please ACK this so I can take this through the GPIO tree.
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-08 4:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-09 13:50 [PATCH 172/182] staging: vme: use gpiochip data pointer Linus Walleij
2015-12-11 6:58 ` Martyn Welch
2015-12-14 14:14 ` Linus Walleij
2015-12-14 21:51 ` Martyn Welch
2016-02-08 4:08 ` Greg Kroah-Hartman
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).