diff options
| author |   Peng Fan <peng.fan@nxp.com> | 2019-12-04 09:24:35 +0000 |
|---|---|---|
| committer |   Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-12-11 11:06:06 +0100 |
| commit | 0c21639f5a4b1f91b8b963058f2aa8b2a9e5f61c (patch) | |
| tree | 58ed5de96170e9212820429fee68ea6fc14a22bc /drivers/gpio/gpio-mvebu.c | |
| parent | gpio: pca953x: Remove redundant forward declaration (diff) | |
| download | linux-dev-0c21639f5a4b1f91b8b963058f2aa8b2a9e5f61c.tar.xz linux-dev-0c21639f5a4b1f91b8b963058f2aa8b2a9e5f61c.zip | |
gpio: mvebu: use platform_irq_count
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.
Reviewed-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Diffstat (limited to 'drivers/gpio/gpio-mvebu.c')
| -rw-r--r-- | drivers/gpio/gpio-mvebu.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c index 993bbeb3c006..f0fd82b3417c 100644 --- a/drivers/gpio/gpio-mvebu.c +++ b/drivers/gpio/gpio-mvebu.c @@ -46,7 +46,6 @@ #include <linux/irqdomain.h> #include <linux/mfd/syscon.h> #include <linux/of_device.h> -#include <linux/of_irq.h> #include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> #include <linux/pwm.h> @@ -1102,7 +1101,11 @@ static int mvebu_gpio_probe(struct platform_device *pdev) soc_variant = MVEBU_GPIO_SOC_VARIANT_ORION; /* Some gpio controllers do not provide irq support */ - have_irqs = of_irq_count(np) != 0; + err = platform_irq_count(pdev); + if (err < 0) + return err; + + have_irqs = err != 0; mvchip = devm_kzalloc(&pdev->dev, sizeof(struct mvebu_gpio_chip), GFP_KERNEL); |