2020-01-08 07:14:19

by Peng Fan

Subject: [PATCH V2] pinctrl: mvebu: armada-37xx: use use platform api

From: Peng Fan <[email protected]>

platform_irq_count() and platform_get_irq() 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 <[email protected]>
---

V2:
replace %pe with %d for err msg.

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index aa9dcde0f069..bede168917ba 100644
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -15,7 +15,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_device.h>
-#include <linux/of_irq.h>
#include <linux/pinctrl/pinconf-generic.h>
#include <linux/pinctrl/pinconf.h>
#include <linux/pinctrl/pinctrl.h>
@@ -739,7 +738,14 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev,
return ret;
}

- nr_irq_parent = of_irq_count(np);
+ nr_irq_parent = platform_irq_count(pdev);
+ if (nr_irq_parent < 0) {
+ if (nr_irq_parent != -EPROBE_DEFER)
+ dev_err(dev, "Couldn't determine irq count: %d\n",
+ nr_irq_parent);
+ return nr_irq_parent;
+ }
+
spin_lock_init(&info->irq_lock);

if (!nr_irq_parent) {
@@ -776,7 +782,7 @@ static int armada_37xx_irqchip_register(struct platform_device *pdev,
if (!girq->parents)
return -ENOMEM;
for (i = 0; i < nr_irq_parent; i++) {
- int irq = irq_of_parse_and_map(np, i);
+ int irq = platform_get_irq(pdev, i);

if (irq < 0)
continue;
--
2.16.4

2020-01-08 07:57:18

by Uwe Kleine-König

Subject: Re: [PATCH V2] pinctrl: mvebu: armada-37xx: use use platform api

Hello,

On Wed, Jan 08, 2020 at 07:12:46AM +0000, Peng Fan wrote:
> From: Peng Fan <[email protected]>
>
> platform_irq_count() and platform_get_irq() 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 <[email protected]>
> ---
>
> V2:
> replace %pe with %d for err msg.

FTR: I really like having %pe for its better expressiveness and started
arguing in the v1 thread. So please wait a bit before applying this
patch.

Thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |