2022-10-06 05:51:25

by Christophe Leroy

Subject: [PATCH] iommu: fsl_pamu: Replace NO_IRQ by 0

NO_IRQ is used to check the return of irq_of_parse_and_map().

On some architecture NO_IRQ is 0, on other architectures it is -1.

irq_of_parse_and_map() returns 0 on error, independent of NO_IRQ.

So use 0 instead of using NO_IRQ.

Signed-off-by: Christophe Leroy <[email protected]>
---
drivers/iommu/fsl_pamu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index 0d03f837a5d4..1b53d2da2c19 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -779,7 +779,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
of_get_address(dev->of_node, 0, &size, NULL);

irq = irq_of_parse_and_map(dev->of_node, 0);
- if (irq == NO_IRQ) {
+ if (!irq) {
dev_warn(dev, "no interrupts listed in PAMU node\n");
goto error;
}
@@ -903,7 +903,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
return 0;

error:
- if (irq != NO_IRQ)
+ if (irq)
free_irq(irq, data);

kfree_sensitive(data);
--
2.37.1

2022-10-06 10:47:16

by Robin Murphy

Subject: Re: [PATCH] iommu: fsl_pamu: Replace NO_IRQ by 0

On 2022-10-06 06:24, Christophe Leroy wrote:
> NO_IRQ is used to check the return of irq_of_parse_and_map().
>
> On some architecture NO_IRQ is 0, on other architectures it is -1.
>
> irq_of_parse_and_map() returns 0 on error, independent of NO_IRQ.
>
> So use 0 instead of using NO_IRQ.

Crucially, NO_IRQ *is* 0 on PowerPC where this driver actually runs, so
there's no functional issue here. However the justification for cleaning
it up makes perfect sense overall.

Reviewed-by: Robin Murphy <[email protected]>

> Signed-off-by: Christophe Leroy <[email protected]>
> ---
> drivers/iommu/fsl_pamu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
> index 0d03f837a5d4..1b53d2da2c19 100644
> --- a/drivers/iommu/fsl_pamu.c
> +++ b/drivers/iommu/fsl_pamu.c
> @@ -779,7 +779,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
> of_get_address(dev->of_node, 0, &size, NULL);
>
> irq = irq_of_parse_and_map(dev->of_node, 0);
> - if (irq == NO_IRQ) {
> + if (!irq) {
> dev_warn(dev, "no interrupts listed in PAMU node\n");
> goto error;
> }
> @@ -903,7 +903,7 @@ static int fsl_pamu_probe(struct platform_device *pdev)
> return 0;
>
> error:
> - if (irq != NO_IRQ)
> + if (irq)
> free_irq(irq, data);
>
> kfree_sensitive(data);

2022-11-03 14:01:33

by Joerg Roedel

Subject: Re: [PATCH] iommu: fsl_pamu: Replace NO_IRQ by 0

On Thu, Oct 06, 2022 at 07:24:03AM +0200, Christophe Leroy wrote:
> drivers/iommu/fsl_pamu.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks.