[v2,2/2] gpio: bcm-kona: use platform_irq_count
diff mbox series

Message ID 1575433106-16171-2-git-send-email-peng.fan@nxp.com
State New
Headers show
Series
  • [v2,1/2] gpio: mvebu: use platform_irq_count
Related show

Commit Message

Peng Fan Dec. 4, 2019, 4:20 a.m. UTC
From: Peng Fan <peng.fan@nxp.com>

platform_irq_count() is the more generic way (independent of
device trees) to determine the count of available interrupts. So
use this instead.

As platform_irq_count() might return an error code (which
of_irq_count doesn't) some additional handling is necessary.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
---

V2:
 Update commit log, and add err handling
 Not tested, just code inspection

 drivers/gpio/gpio-bcm-kona.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

Comments

Uwe Kleine-König Dec. 4, 2019, 7:27 a.m. UTC | #1
On Wed, Dec 04, 2019 at 04:20:45AM +0000, Peng Fan wrote:
> From: Peng Fan <peng.fan@nxp.com>
> 
> platform_irq_count() is the more generic way (independent of
> device trees) to determine the count of available interrupts. So
> use this instead.
> 
> As platform_irq_count() might return an error code (which
> of_irq_count doesn't) some additional handling is necessary.
> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> 
> V2:
>  Update commit log, and add err handling
>  Not tested, just code inspection
> 
>  drivers/gpio/gpio-bcm-kona.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
> index 4122683eb1f9..52ff56166263 100644
> --- a/drivers/gpio/gpio-bcm-kona.c
> +++ b/drivers/gpio/gpio-bcm-kona.c
> @@ -19,7 +19,6 @@
>  #include <linux/io.h>
>  #include <linux/gpio/driver.h>
>  #include <linux/of_device.h>
> -#include <linux/of_irq.h>
>  #include <linux/init.h>
>  #include <linux/irqdomain.h>
>  #include <linux/irqchip/chained_irq.h>
> @@ -586,11 +585,18 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
>  
>  	kona_gpio->gpio_chip = template_chip;
>  	chip = &kona_gpio->gpio_chip;
> -	kona_gpio->num_bank = of_irq_count(dev->of_node);
> -	if (kona_gpio->num_bank == 0) {
> +	ret = platform_irq_count(pdev);
> +	if (!ret) {
>  		dev_err(dev, "Couldn't determine # GPIO banks\n");
>  		return -ENOENT;
> +	} else if (ret < 0) {
> +		if (ret != -EPROBE_DEFER)
> +			dev_err(dev, "Couldn't determine GPIO banks: %d\n",
> +				ret);

You can use the new %pe feature here:

	dev_err(dev, "Couldn't determine GPIO banks: %pe\n",
		ERR_PTR(ret));

> +		return ret;
>  	}
> +	kona_gpio->num_bank = ret;
> +

Looks otherwise ok.

Best regards
Uwe
Peng Fan Dec. 4, 2019, 8:41 a.m. UTC | #2
> Subject: Re: [PATCH v2 2/2] gpio: bcm-kona: use platform_irq_count
> 
> On Wed, Dec 04, 2019 at 04:20:45AM +0000, Peng Fan wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > platform_irq_count() is the more generic way (independent of device
> > trees) to determine the count of available interrupts. So use this
> > instead.
> >
> > As platform_irq_count() might return an error code (which of_irq_count
> > doesn't) some additional handling is necessary.
> >
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >
> > V2:
> >  Update commit log, and add err handling  Not tested, just code
> > inspection
> >
> >  drivers/gpio/gpio-bcm-kona.c | 12 +++++++++---
> >  1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/gpio/gpio-bcm-kona.c
> > b/drivers/gpio/gpio-bcm-kona.c index 4122683eb1f9..52ff56166263
> 100644
> > --- a/drivers/gpio/gpio-bcm-kona.c
> > +++ b/drivers/gpio/gpio-bcm-kona.c
> > @@ -19,7 +19,6 @@
> >  #include <linux/io.h>
> >  #include <linux/gpio/driver.h>
> >  #include <linux/of_device.h>
> > -#include <linux/of_irq.h>
> >  #include <linux/init.h>
> >  #include <linux/irqdomain.h>
> >  #include <linux/irqchip/chained_irq.h> @@ -586,11 +585,18 @@ static
> > int bcm_kona_gpio_probe(struct platform_device *pdev)
> >
> >  	kona_gpio->gpio_chip = template_chip;
> >  	chip = &kona_gpio->gpio_chip;
> > -	kona_gpio->num_bank = of_irq_count(dev->of_node);
> > -	if (kona_gpio->num_bank == 0) {
> > +	ret = platform_irq_count(pdev);
> > +	if (!ret) {
> >  		dev_err(dev, "Couldn't determine # GPIO banks\n");
> >  		return -ENOENT;
> > +	} else if (ret < 0) {
> > +		if (ret != -EPROBE_DEFER)
> > +			dev_err(dev, "Couldn't determine GPIO banks: %d\n",
> > +				ret);
> 
> You can use the new %pe feature here:

Checkpatch reports warning:

WARNING: Invalid vsprintf pointer extension '%pe'
#49: FILE: drivers/gpio/gpio-bcm-kona.c:593:
+               if (ret != -EPROBE_DEFER)
+                       dev_err(dev, "Couldn't determine GPIO banks: (%pe)\n",
+                               ERR_PTR(ret));

Thanks,
Peng.

> 
> 	dev_err(dev, "Couldn't determine GPIO banks: %pe\n",
> 		ERR_PTR(ret));
> 
> > +		return ret;
> >  	}
> > +	kona_gpio->num_bank = ret;
> > +
> 
> Looks otherwise ok.
> 
> Best regards
> Uwe
> 
> --
> Pengutronix e.K.                           | Uwe Kleine-König
> |
> Industrial Linux Solutions                 |
> https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.
> pengutronix.de%2F&amp;data=02%7C01%7Cpeng.fan%40nxp.com%7C8c566
> 59ba01b4b5db43608d7788b77fa%7C686ea1d3bc2b4c6fa92cd99c5c301635
> %7C0%7C0%7C637110412715339679&amp;sdata=MDjn8C9mtDqZCN01nOT
> KhVJoLiqPue8In5v5OT91B6Y%3D&amp;reserved=0 |
Uwe Kleine-König Dec. 4, 2019, 9:17 a.m. UTC | #3
On Wed, Dec 04, 2019 at 08:41:14AM +0000, Peng Fan wrote:
> > Subject: Re: [PATCH v2 2/2] gpio: bcm-kona: use platform_irq_count
> > 
> > On Wed, Dec 04, 2019 at 04:20:45AM +0000, Peng Fan wrote:
> > > From: Peng Fan <peng.fan@nxp.com>
> > >
> > > platform_irq_count() is the more generic way (independent of device
> > > trees) to determine the count of available interrupts. So use this
> > > instead.
> > >
> > > As platform_irq_count() might return an error code (which of_irq_count
> > > doesn't) some additional handling is necessary.
> > >
> > > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > > ---
> > >
> > > V2:
> > >  Update commit log, and add err handling  Not tested, just code
> > > inspection
> > >
> > >  drivers/gpio/gpio-bcm-kona.c | 12 +++++++++---
> > >  1 file changed, 9 insertions(+), 3 deletions(-)
> > >
> > > diff --git a/drivers/gpio/gpio-bcm-kona.c
> > > b/drivers/gpio/gpio-bcm-kona.c index 4122683eb1f9..52ff56166263
> > 100644
> > > --- a/drivers/gpio/gpio-bcm-kona.c
> > > +++ b/drivers/gpio/gpio-bcm-kona.c
> > > @@ -19,7 +19,6 @@
> > >  #include <linux/io.h>
> > >  #include <linux/gpio/driver.h>
> > >  #include <linux/of_device.h>
> > > -#include <linux/of_irq.h>
> > >  #include <linux/init.h>
> > >  #include <linux/irqdomain.h>
> > >  #include <linux/irqchip/chained_irq.h> @@ -586,11 +585,18 @@ static
> > > int bcm_kona_gpio_probe(struct platform_device *pdev)
> > >
> > >  	kona_gpio->gpio_chip = template_chip;
> > >  	chip = &kona_gpio->gpio_chip;
> > > -	kona_gpio->num_bank = of_irq_count(dev->of_node);
> > > -	if (kona_gpio->num_bank == 0) {
> > > +	ret = platform_irq_count(pdev);
> > > +	if (!ret) {
> > >  		dev_err(dev, "Couldn't determine # GPIO banks\n");
> > >  		return -ENOENT;
> > > +	} else if (ret < 0) {
> > > +		if (ret != -EPROBE_DEFER)
> > > +			dev_err(dev, "Couldn't determine GPIO banks: %d\n",
> > > +				ret);
> > 
> > You can use the new %pe feature here:
> 
> Checkpatch reports warning:
> 
> WARNING: Invalid vsprintf pointer extension '%pe'
> #49: FILE: drivers/gpio/gpio-bcm-kona.c:593:
> +               if (ret != -EPROBE_DEFER)
> +                       dev_err(dev, "Couldn't determine GPIO banks: (%pe)\n",
> +                               ERR_PTR(ret));

Then you test with a tree older than
1d28122131b263f169a7f2d288178a56c69ee076. Then you also might not have
57f5677e535ba24b8926a7125be2ef8d7f09323c which you need to make %pe
work.

Best regards
Uwe

Patch
diff mbox series

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index 4122683eb1f9..52ff56166263 100644
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -19,7 +19,6 @@ 
 #include <linux/io.h>
 #include <linux/gpio/driver.h>
 #include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/init.h>
 #include <linux/irqdomain.h>
 #include <linux/irqchip/chained_irq.h>
@@ -586,11 +585,18 @@  static int bcm_kona_gpio_probe(struct platform_device *pdev)
 
 	kona_gpio->gpio_chip = template_chip;
 	chip = &kona_gpio->gpio_chip;
-	kona_gpio->num_bank = of_irq_count(dev->of_node);
-	if (kona_gpio->num_bank == 0) {
+	ret = platform_irq_count(pdev);
+	if (!ret) {
 		dev_err(dev, "Couldn't determine # GPIO banks\n");
 		return -ENOENT;
+	} else if (ret < 0) {
+		if (ret != -EPROBE_DEFER)
+			dev_err(dev, "Couldn't determine GPIO banks: %d\n",
+				ret);
+		return ret;
 	}
+	kona_gpio->num_bank = ret;
+
 	if (kona_gpio->num_bank > GPIO_MAX_BANK_NUM) {
 		dev_err(dev, "Too many GPIO banks configured (max=%d)\n",
 			GPIO_MAX_BANK_NUM);