diff mbox series

[4.4.y-cip] gpio: rcar: use gpiochip data pointer

Message ID 20200903141052.12720-1-prabhakar.mahadev-lad.rj@bp.renesas.com (mailing list archive)
State Superseded
Headers show
Series [4.4.y-cip] gpio: rcar: use gpiochip data pointer | expand

Commit Message

Lad Prabhakar Sept. 3, 2020, 2:10 p.m. UTC 
From: Linus Walleij <linus.walleij@linaro.org>

commit c7b6f457cb53bceece484f4c528d1c149995e6c7 upstream.

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: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Cc: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Hisashi Nakamura <hisashi.nakamura.ak@renesas.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[PL: Fixes 6e52cced1aa58 ("gpio: rcar: Implement gpiochip.set_multiple()")]
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
---
 drivers/gpio/gpio-rcar.c | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

Comments

Pavel Machek Sept. 3, 2020, 5:54 p.m. UTC | #1 
Hi!

> 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().

Okay, so this is a cleanup that makes sense for mainline.

> [PL: Fixes 6e52cced1aa58 ("gpio: rcar: Implement  gpiochip.set_multiple()")]

Does it fix set_multiple? ... seems so.

Fixing set_multiple is possible with this oneliner, right?

> @@ -541,7 +532,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
>  	irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;
>  	irq_chip->flags	= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
>  
> -	ret = gpiochip_add(gpio_chip);
> +	ret = gpiochip_add_data(gpio_chip, p);
>  	if (ret) {
>  		dev_err(dev, "failed to add GPIO controller\n");
>  		goto err0;

The patch is okay and now I understand why you want it. It would have
been nice if changelog told me directly.

Can set_multiple use container_of() too? We get less differences
between 4.4 and 4.4-cip that way, and it is still one-liner.

Best regards,

								Pavel
Lad Prabhakar Sept. 3, 2020, 6:01 p.m. UTC | #2 
Hi Pavel,

Thank you for the review.

> -----Original Message-----
> From: Pavel Machek <pavel@denx.de>
> Sent: 03 September 2020 18:55
> To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>
> Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das
> <biju.das.jz@bp.renesas.com>
> Subject: Re: [PATCH 4.4.y-cip] gpio: rcar: use gpiochip data pointer
>
> Hi!
>
> > 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().
>
> Okay, so this is a cleanup that makes sense for mainline.
>
> > [PL: Fixes 6e52cced1aa58 ("gpio: rcar: Implement  gpiochip.set_multiple()")]
>
> Does it fix set_multiple? ... seems so.
>
> Fixing set_multiple is possible with this oneliner, right?
>
> > @@ -541,7 +532,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
> >  irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;
> >  irq_chip->flags= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
> >
> > -ret = gpiochip_add(gpio_chip);
> > +ret = gpiochip_add_data(gpio_chip, p);
> >  if (ret) {
> >  dev_err(dev, "failed to add GPIO controller\n");
> >  goto err0;
>
> The patch is okay and now I understand why you want it. It would have
> been nice if changelog told me directly.
>
My bad.

> Can set_multiple use container_of() too? We get less differences
> between 4.4 and 4.4-cip that way, and it is still one-liner.
>
It could use gpio_to_priv(), but since there was an commit upstream already I just pulled it in.

Let me know if you if you are OK with the patch or I shall post a one-liner.

Cheers,
Prabhakar


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5407): https://lists.cip-project.org/g/cip-dev/message/5407
Mute This Topic: https://lists.cip-project.org/mt/76607574/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Lad Prabhakar Sept. 4, 2020, 7:45 a.m. UTC | #3 
Hi Pavel,

> -----Original Message-----
> From: Prabhakar Mahadev Lad
> Sent: 03 September 2020 19:01
> To: Pavel Machek <pavel@denx.de>
> Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Biju Das <biju.das.jz@bp.renesas.com>
> Subject: RE: [PATCH 4.4.y-cip] gpio: rcar: use gpiochip data pointer
>
> Hi Pavel,
>
> Thank you for the review.
>
> > -----Original Message-----
> > From: Pavel Machek <pavel@denx.de>
> > Sent: 03 September 2020 18:55
> > To: Prabhakar Mahadev Lad <prabhakar.mahadev-lad.rj@bp.renesas.com>
> > Cc: cip-dev@lists.cip-project.org; Nobuhiro Iwamatsu <nobuhiro1.iwamatsu@toshiba.co.jp>; Pavel Machek <pavel@denx.de>; Biju Das
> > <biju.das.jz@bp.renesas.com>
> > Subject: Re: [PATCH 4.4.y-cip] gpio: rcar: use gpiochip data pointer
> >
> > Hi!
> >
> > > 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().
> >
> > Okay, so this is a cleanup that makes sense for mainline.
> >
> > > [PL: Fixes 6e52cced1aa58 ("gpio: rcar: Implement  gpiochip.set_multiple()")]
> >
> > Does it fix set_multiple? ... seems so.
> >
> > Fixing set_multiple is possible with this oneliner, right?
> >
> > > @@ -541,7 +532,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
> > >  irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;
> > >  irq_chip->flags= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
> > >
> > > -ret = gpiochip_add(gpio_chip);
> > > +ret = gpiochip_add_data(gpio_chip, p);
> > >  if (ret) {
> > >  dev_err(dev, "failed to add GPIO controller\n");
> > >  goto err0;
> >
> > The patch is okay and now I understand why you want it. It would have
> > been nice if changelog told me directly.
> >
> My bad.
>
> > Can set_multiple use container_of() too? We get less differences
> > between 4.4 and 4.4-cip that way, and it is still one-liner.
> >
> It could use gpio_to_priv(), but since there was an commit upstream already I just pulled it in.
>
I have now posted a oneliner patch (https://patchwork.kernel.org/patch/11756155/)

> Let me know if you if you are OK with the patch or I shall post a one-liner.
>
Please drop the current patch

Cheers,
Prabhakar


Renesas Electronics Europe GmbH, Geschaeftsfuehrer/President: Carsten Jauch, Sitz der Gesellschaft/Registered office: Duesseldorf, Arcadiastrasse 10, 40472 Duesseldorf, Germany, Handelsregister/Commercial Register: Duesseldorf, HRB 3708 USt-IDNr./Tax identification no.: DE 119353406 WEEE-Reg.-Nr./WEEE reg. no.: DE 14978647
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#5416): https://lists.cip-project.org/g/cip-dev/message/5416
Mute This Topic: https://lists.cip-project.org/mt/76607574/4520428
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129116/1171672734/xyzzy  [patchwork-cip-dev@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Pavel Machek Sept. 9, 2020, 6:06 a.m. UTC | #4 
Hi!

> > > Fixing set_multiple is possible with this oneliner, right?
> > >
> > > > @@ -541,7 +532,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
> > > >  irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;
> > > >  irq_chip->flags= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
> > > >
> > > > -ret = gpiochip_add(gpio_chip);
> > > > +ret = gpiochip_add_data(gpio_chip, p);
> > > >  if (ret) {
> > > >  dev_err(dev, "failed to add GPIO controller\n");
> > > >  goto err0;
> > >
> > > The patch is okay and now I understand why you want it. It would have
> > > been nice if changelog told me directly.
> > >
> > My bad.
> >
> > > Can set_multiple use container_of() too? We get less differences
> > > between 4.4 and 4.4-cip that way, and it is still one-liner.
> > >
> > It could use gpio_to_priv(), but since there was an commit upstream already I just pulled it in.
> >
> I have now posted a oneliner patch (https://patchwork.kernel.org/patch/11756155/)
> 
> > Let me know if you if you are OK with the patch or I shall post a one-liner.
> >
> Please drop the current patch

Done, thanks... and let me take a look.

Best regards,
								Pavel
diff mbox series

Patch

diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
index e829f11aca8f..cffeebd2ac4d 100644
--- a/drivers/gpio/gpio-rcar.c
+++ b/drivers/gpio/gpio-rcar.c
@@ -84,8 +84,7 @@  static void gpio_rcar_modify_bit(struct gpio_rcar_priv *p, int offs,
 static void gpio_rcar_irq_disable(struct irq_data *d)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-	struct gpio_rcar_priv *p = container_of(gc, struct gpio_rcar_priv,
-						gpio_chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(gc);
 
 	gpio_rcar_write(p, INTMSK, ~BIT(irqd_to_hwirq(d)));
 }
@@ -93,8 +92,7 @@  static void gpio_rcar_irq_disable(struct irq_data *d)
 static void gpio_rcar_irq_enable(struct irq_data *d)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-	struct gpio_rcar_priv *p = container_of(gc, struct gpio_rcar_priv,
-						gpio_chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(gc);
 
 	gpio_rcar_write(p, MSKCLR, BIT(irqd_to_hwirq(d)));
 }
@@ -137,8 +135,7 @@  static void gpio_rcar_config_interrupt_input_mode(struct gpio_rcar_priv *p,
 static int gpio_rcar_irq_set_type(struct irq_data *d, unsigned int type)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-	struct gpio_rcar_priv *p = container_of(gc, struct gpio_rcar_priv,
-						gpio_chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(gc);
 	unsigned int hwirq = irqd_to_hwirq(d);
 
 	dev_dbg(&p->pdev->dev, "sense irq = %d, type = %d\n", hwirq, type);
@@ -175,8 +172,7 @@  static int gpio_rcar_irq_set_type(struct irq_data *d, unsigned int type)
 static int gpio_rcar_irq_set_wake(struct irq_data *d, unsigned int on)
 {
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
-	struct gpio_rcar_priv *p = container_of(gc, struct gpio_rcar_priv,
-						gpio_chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(gc);
 	int error;
 
 	if (p->irq_parent) {
@@ -260,16 +256,11 @@  static irqreturn_t gpio_rcar_irq_handler(int irq, void *dev_id)
 	return irqs_handled ? IRQ_HANDLED : IRQ_NONE;
 }
 
-static inline struct gpio_rcar_priv *gpio_to_priv(struct gpio_chip *chip)
-{
-	return container_of(chip, struct gpio_rcar_priv, gpio_chip);
-}
-
 static void gpio_rcar_config_general_input_output_mode(struct gpio_chip *chip,
 						       unsigned int gpio,
 						       bool output)
 {
-	struct gpio_rcar_priv *p = gpio_to_priv(chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(chip);
 	unsigned long flags;
 
 	/* follow steps in the GPIO documentation for
@@ -293,7 +284,7 @@  static void gpio_rcar_config_general_input_output_mode(struct gpio_chip *chip,
 
 static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset)
 {
-	struct gpio_rcar_priv *p = gpio_to_priv(chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(chip);
 	int error;
 
 	error = pm_runtime_get_sync(&p->pdev->dev);
@@ -309,7 +300,7 @@  static int gpio_rcar_request(struct gpio_chip *chip, unsigned offset)
 
 static void gpio_rcar_free(struct gpio_chip *chip, unsigned offset)
 {
-	struct gpio_rcar_priv *p = gpio_to_priv(chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(chip);
 
 	pinctrl_free_gpio(chip->base + offset);
 
@@ -333,15 +324,15 @@  static int gpio_rcar_get(struct gpio_chip *chip, unsigned offset)
 
 	/* testing on r8a7790 shows that INDT does not show correct pin state
 	 * when configured as output, so use OUTDT in case of output pins */
-	if (gpio_rcar_read(gpio_to_priv(chip), INOUTSEL) & bit)
-		return !!(gpio_rcar_read(gpio_to_priv(chip), OUTDT) & bit);
+	if (gpio_rcar_read(gpiochip_get_data(chip), INOUTSEL) & bit)
+		return !!(gpio_rcar_read(gpiochip_get_data(chip), OUTDT) & bit);
 	else
-		return !!(gpio_rcar_read(gpio_to_priv(chip), INDT) & bit);
+		return !!(gpio_rcar_read(gpiochip_get_data(chip), INDT) & bit);
 }
 
 static void gpio_rcar_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-	struct gpio_rcar_priv *p = gpio_to_priv(chip);
+	struct gpio_rcar_priv *p = gpiochip_get_data(chip);
 	unsigned long flags;
 
 	spin_lock_irqsave(&p->lock, flags);
@@ -541,7 +532,7 @@  static int gpio_rcar_probe(struct platform_device *pdev)
 	irq_chip->irq_release_resources = gpio_rcar_irq_release_resources;
 	irq_chip->flags	= IRQCHIP_SET_TYPE_MASKED | IRQCHIP_MASK_ON_SUSPEND;
 
-	ret = gpiochip_add(gpio_chip);
+	ret = gpiochip_add_data(gpio_chip, p);
 	if (ret) {
 		dev_err(dev, "failed to add GPIO controller\n");
 		goto err0;