* [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map()
@ 2023-07-31 7:42 Dan Carpenter
2023-07-31 8:02 ` esben
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Dan Carpenter @ 2023-07-31 7:42 UTC (permalink / raw)
To: Esben Haabendal
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michal Simek, Harini Katakam, Haoyue Xu, huangjunxian,
Yang Yingliang, Rob Herring, netdev, kernel-janitors
Most kernel functions return negative error codes but some irq functions
return zero on error. In this code irq_of_parse_and_map(), returns zero
and platform_get_irq() returns negative error codes. We need to handle
both cases appropriately.
Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
drivers/net/ethernet/xilinx/ll_temac_main.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
index e0ac1bcd9925..49f303353ecb 100644
--- a/drivers/net/ethernet/xilinx/ll_temac_main.c
+++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
@@ -1567,12 +1567,16 @@ static int temac_probe(struct platform_device *pdev)
}
/* Error handle returned DMA RX and TX interrupts */
- if (lp->rx_irq < 0)
- return dev_err_probe(&pdev->dev, lp->rx_irq,
+ if (lp->rx_irq <= 0) {
+ rc = lp->rx_irq ?: -EINVAL;
+ return dev_err_probe(&pdev->dev, rc,
"could not get DMA RX irq\n");
- if (lp->tx_irq < 0)
- return dev_err_probe(&pdev->dev, lp->tx_irq,
+ }
+ if (lp->tx_irq <= 0) {
+ rc = lp->tx_irq ?: -EINVAL;
+ return dev_err_probe(&pdev->dev, rc,
"could not get DMA TX irq\n");
+ }
if (temac_np) {
/* Retrieve the MAC address */
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map()
2023-07-31 7:42 [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map() Dan Carpenter
@ 2023-07-31 8:02 ` esben
2023-07-31 8:02 ` Yang Yingliang
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: esben @ 2023-07-31 8:02 UTC (permalink / raw)
To: Dan Carpenter
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michal Simek, Harini Katakam, Haoyue Xu, huangjunxian,
Yang Yingliang, Rob Herring, netdev, kernel-janitors
Dan Carpenter <dan.carpenter@linaro.org> writes:
> Most kernel functions return negative error codes but some irq functions
> return zero on error. In this code irq_of_parse_and_map(), returns zero
> and platform_get_irq() returns negative error codes. We need to handle
> both cases appropriately.
>
> Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Acked-by: Esben Haabendal <esben@geanix.com>
> ---
> drivers/net/ethernet/xilinx/ll_temac_main.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
> index e0ac1bcd9925..49f303353ecb 100644
> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> @@ -1567,12 +1567,16 @@ static int temac_probe(struct platform_device *pdev)
> }
>
> /* Error handle returned DMA RX and TX interrupts */
> - if (lp->rx_irq < 0)
> - return dev_err_probe(&pdev->dev, lp->rx_irq,
> + if (lp->rx_irq <= 0) {
> + rc = lp->rx_irq ?: -EINVAL;
> + return dev_err_probe(&pdev->dev, rc,
> "could not get DMA RX irq\n");
> - if (lp->tx_irq < 0)
> - return dev_err_probe(&pdev->dev, lp->tx_irq,
> + }
> + if (lp->tx_irq <= 0) {
> + rc = lp->tx_irq ?: -EINVAL;
> + return dev_err_probe(&pdev->dev, rc,
> "could not get DMA TX irq\n");
> + }
>
> if (temac_np) {
> /* Retrieve the MAC address */
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map()
2023-07-31 7:42 [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map() Dan Carpenter
2023-07-31 8:02 ` esben
@ 2023-07-31 8:02 ` Yang Yingliang
2023-07-31 10:57 ` Katakam, Harini
2023-08-01 21:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Yang Yingliang @ 2023-07-31 8:02 UTC (permalink / raw)
To: Dan Carpenter, Esben Haabendal
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Michal Simek, Harini Katakam, Haoyue Xu, huangjunxian,
Rob Herring, netdev, kernel-janitors
Reviewed-by: Yang Yingliang <yangyingliang@huawei.com>
On 2023/7/31 15:42, Dan Carpenter wrote:
> Most kernel functions return negative error codes but some irq functions
> return zero on error. In this code irq_of_parse_and_map(), returns zero
> and platform_get_irq() returns negative error codes. We need to handle
> both cases appropriately.
>
> Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> drivers/net/ethernet/xilinx/ll_temac_main.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ethernet/xilinx/ll_temac_main.c b/drivers/net/ethernet/xilinx/ll_temac_main.c
> index e0ac1bcd9925..49f303353ecb 100644
> --- a/drivers/net/ethernet/xilinx/ll_temac_main.c
> +++ b/drivers/net/ethernet/xilinx/ll_temac_main.c
> @@ -1567,12 +1567,16 @@ static int temac_probe(struct platform_device *pdev)
> }
>
> /* Error handle returned DMA RX and TX interrupts */
> - if (lp->rx_irq < 0)
> - return dev_err_probe(&pdev->dev, lp->rx_irq,
> + if (lp->rx_irq <= 0) {
> + rc = lp->rx_irq ?: -EINVAL;
> + return dev_err_probe(&pdev->dev, rc,
> "could not get DMA RX irq\n");
> - if (lp->tx_irq < 0)
> - return dev_err_probe(&pdev->dev, lp->tx_irq,
> + }
> + if (lp->tx_irq <= 0) {
> + rc = lp->tx_irq ?: -EINVAL;
> + return dev_err_probe(&pdev->dev, rc,
> "could not get DMA TX irq\n");
> + }
>
> if (temac_np) {
> /* Retrieve the MAC address */
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map()
2023-07-31 7:42 [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map() Dan Carpenter
2023-07-31 8:02 ` esben
2023-07-31 8:02 ` Yang Yingliang
@ 2023-07-31 10:57 ` Katakam, Harini
2023-08-01 21:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Katakam, Harini @ 2023-07-31 10:57 UTC (permalink / raw)
To: Dan Carpenter, Esben Haabendal
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni,
Simek, Michal, Haoyue Xu, huangjunxian, Yang Yingliang,
Rob Herring, netdev@vger.kernel.org,
kernel-janitors@vger.kernel.org
> -----Original Message-----
> From: Dan Carpenter <dan.carpenter@linaro.org>
> Sent: Monday, July 31, 2023 1:13 PM
> To: Esben Haabendal <esben@geanix.com>
> Cc: David S. Miller <davem@davemloft.net>; Eric Dumazet
> <edumazet@google.com>; Jakub Kicinski <kuba@kernel.org>; Paolo Abeni
> <pabeni@redhat.com>; Simek, Michal <michal.simek@amd.com>; Katakam,
> Harini <harini.katakam@amd.com>; Haoyue Xu <xuhaoyue1@hisilicon.com>;
> huangjunxian <huangjunxian6@hisilicon.com>; Yang Yingliang
> <yangyingliang@huawei.com>; Rob Herring <robh@kernel.org>;
> netdev@vger.kernel.org; kernel-janitors@vger.kernel.org
> Subject: [PATCH net] net: ll_temac: fix error checking of
> irq_of_parse_and_map()
>
> Most kernel functions return negative error codes but some irq functions
> return zero on error. In this code irq_of_parse_and_map(), returns zero
> and platform_get_irq() returns negative error codes. We need to handle
> both cases appropriately.
>
> Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree
> platforms")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Thanks,
Reviewed-by: Harini Katakam <harini.katakam@amd.com>
Regards,
Harini
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map()
2023-07-31 7:42 [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map() Dan Carpenter
` (2 preceding siblings ...)
2023-07-31 10:57 ` Katakam, Harini
@ 2023-08-01 21:50 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-08-01 21:50 UTC (permalink / raw)
To: Dan Carpenter
Cc: esben, davem, edumazet, kuba, pabeni, michal.simek,
harini.katakam, xuhaoyue1, huangjunxian6, yangyingliang, robh,
netdev, kernel-janitors
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:
On Mon, 31 Jul 2023 10:42:32 +0300 you wrote:
> Most kernel functions return negative error codes but some irq functions
> return zero on error. In this code irq_of_parse_and_map(), returns zero
> and platform_get_irq() returns negative error codes. We need to handle
> both cases appropriately.
>
> Fixes: 8425c41d1ef7 ("net: ll_temac: Extend support to non-device-tree platforms")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
>
> [...]
Here is the summary with links:
- [net] net: ll_temac: fix error checking of irq_of_parse_and_map()
https://git.kernel.org/netdev/net/c/ef45e8400f5b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-08-01 21:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-31 7:42 [PATCH net] net: ll_temac: fix error checking of irq_of_parse_and_map() Dan Carpenter
2023-07-31 8:02 ` esben
2023-07-31 8:02 ` Yang Yingliang
2023-07-31 10:57 ` Katakam, Harini
2023-08-01 21:50 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).