pinctrl: sunxi: sun50i-h5 use platform_irq_count (f314f20b) · 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. Signed-off-by:

Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/1576672860-14420-2-git-send-email-peng.fan@nxp.com Signed-off-by:

Linus Walleij <linus.walleij@linaro.org>

drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@
		#include <linux/platform_device.h>
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/of_irq.h>
		#include <linux/pinctrl/pinctrl.h>

		#include "pinctrl-sunxi.h"
		@@ -549,7 +548,17 @@ static const struct sunxi_pinctrl_desc sun50i_h5_pinctrl_data = {

		static int sun50i_h5_pinctrl_probe(struct platform_device *pdev)
		{
		switch (of_irq_count(pdev->dev.of_node)) {
		int ret;

		ret = platform_irq_count(pdev);
		if (ret < 0) {
		if (ret != -EPROBE_DEFER)
		dev_err(&pdev->dev, "Couldn't determine irq count: %pe\n",
		ERR_PTR(ret));
		return ret;
		}

		switch (ret) {
		case 2:
		dev_warn(&pdev->dev,
		"Your device tree's pinctrl node is broken, which has no IRQ of PG bank routed.\n");

Admin message