Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[linux.git] / drivers / pinctrl / sunxi / pinctrl-sun50i-h5.c

diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
index a78d7b922ef47529ce0708201ccd7b60a876959f..31d62bbb7f43f001fe93409ae63fb1fb671a15ac 100644 (file)
--- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
+++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c
@@ -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");