gpio: mvebu: use platform_irq_count (0c21639f) · Commits · 戴 / test

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>

drivers/gpio/gpio-mvebu.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message