From: Peng Fan <peng.fan@nxp.com>
To: "rjui@broadcom.com" <rjui@broadcom.com>,
"linus.walleij@linaro.org" <linus.walleij@linaro.org>,
"bgolaszewski@baylibre.com" <bgolaszewski@baylibre.com>,
"f.fainelli@gmail.com" <f.fainelli@gmail.com>,
"sbranden@broadcom.com" <sbranden@broadcom.com>,
"thierry.reding@gmail.com" <thierry.reding@gmail.com>,
"robh@kernel.org" <robh@kernel.org>
Cc: "bcm-kernel-feedback-list@broadcom.com"
<bcm-kernel-feedback-list@broadcom.com>,
"u.kleine-koenig@pengutronix.de" <u.kleine-koenig@pengutronix.de>,
dl-linux-imx <linux-imx@nxp.com>,
"linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
"linux-pwm@vger.kernel.org" <linux-pwm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
Alice Guo <alice.guo@nxp.com>, Peng Fan <peng.fan@nxp.com>
Subject: [PATCH v2 2/2] gpio: bcm-kona: use platform_irq_count
Date: Wed, 4 Dec 2019 04:20:45 +0000 [thread overview]
Message-ID: <1575433106-16171-2-git-send-email-peng.fan@nxp.com> (raw)
In-Reply-To: <1575433106-16171-1-git-send-email-peng.fan@nxp.com>
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);
+ 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);
--
2.16.4
next prev parent reply other threads:[~2019-12-04 4:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 4:20 [PATCH v2 1/2] gpio: mvebu: use platform_irq_count Peng Fan
2019-12-04 4:20 ` Peng Fan [this message]
2019-12-04 7:27 ` [PATCH v2 2/2] gpio: bcm-kona: " Uwe Kleine-König
2019-12-04 8:41 ` Peng Fan
2019-12-04 9:17 ` Uwe Kleine-König
2019-12-04 7:24 ` [PATCH v2 1/2] gpio: mvebu: " Uwe Kleine-König
2019-12-04 16:33 ` Bartosz Golaszewski
2019-12-04 18:47 ` Uwe Kleine-König
2019-12-05 9:22 ` Bartosz Golaszewski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575433106-16171-2-git-send-email-peng.fan@nxp.com \
--to=peng.fan@nxp.com \
--cc=alice.guo@nxp.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=bgolaszewski@baylibre.com \
--cc=f.fainelli@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-gpio@vger.kernel.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=rjui@broadcom.com \
--cc=robh@kernel.org \
--cc=sbranden@broadcom.com \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).