2022-08-12 03:23:38

by Li Qiong

Subject: [PATCH] net: lan966x: fix checking for return value of platform_get_irq_byname()

The platform_get_irq_byname() returns non-zero IRQ number
or negative error number. "if (irq)" always true, chang it
to "if (irq > 0)"

Signed-off-by: Li Qiong <[email protected]>
---
drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
index 1d6e3b641b2e..d928b75f3780 100644
--- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
+++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c
@@ -710,7 +710,7 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)
disable_irq(lan966x->xtr_irq);
lan966x->xtr_irq = -ENXIO;

- if (lan966x->ana_irq) {
+ if (lan966x->ana_irq > 0) {
disable_irq(lan966x->ana_irq);
lan966x->ana_irq = -ENXIO;
}
@@ -718,10 +718,10 @@ static void lan966x_cleanup_ports(struct lan966x *lan966x)
if (lan966x->fdma)
devm_free_irq(lan966x->dev, lan966x->fdma_irq, lan966x);

- if (lan966x->ptp_irq)
+ if (lan966x->ptp_irq > 0)
devm_free_irq(lan966x->dev, lan966x->ptp_irq, lan966x);

- if (lan966x->ptp_ext_irq)
+ if (lan966x->ptp_ext_irq > 0)
devm_free_irq(lan966x->dev, lan966x->ptp_ext_irq, lan966x);
}

@@ -1049,7 +1049,7 @@ static int lan966x_probe(struct platform_device *pdev)
}

lan966x->ana_irq = platform_get_irq_byname(pdev, "ana");
- if (lan966x->ana_irq) {
+ if (lan966x->ana_irq > 0) {
err = devm_request_threaded_irq(&pdev->dev, lan966x->ana_irq, NULL,
lan966x_ana_irq_handler, IRQF_ONESHOT,
"ana irq", lan966x);
--
2.11.0

2022-08-12 10:59:25

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: lan966x: fix checking for return value of platform_get_irq_byname()

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Fri, 12 Aug 2022 11:09:54 +0800 you wrote:
> The platform_get_irq_byname() returns non-zero IRQ number
> or negative error number. "if (irq)" always true, chang it
> to "if (irq > 0)"
>
> Signed-off-by: Li Qiong <[email protected]>
> ---
> drivers/net/ethernet/microchip/lan966x/lan966x_main.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)

Here is the summary with links:
- net: lan966x: fix checking for return value of platform_get_irq_byname()
https://git.kernel.org/netdev/net/c/40b4ac880e21

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html