From: Julia Lawall <julia.lawall@lip6.fr>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Cc: netdev@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/7 v2] drivers: net: cpsw: fix error return code
Date: Sat, 26 Dec 2015 20:12:13 +0100 (CET) [thread overview]
Message-ID: <alpine.DEB.2.02.1512262011220.2070@localhost6.localdomain6> (raw)
In-Reply-To: <567ED36A.9000701@cogentembedded.com>
Propagate the return value of platform_get_irq on failure.
A simplified version of the semantic match that finds the two cases where
no error code is returned at all is as follows:
(http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret; expression e1,e2;
@@
(
if (\(ret < 0\|ret != 0\))
{ ... return ret; }
|
ret = 0
)
... when != ret = e1
when != &ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
---
v2: propagate platform_get_irq return value, at all calls
drivers/net/ethernet/ti/cpsw.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 3409e80..34ce7dc 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2427,7 +2427,7 @@ static int cpsw_probe(struct platform_device *pdev)
ndev->irq = platform_get_irq(pdev, 1);
if (ndev->irq < 0) {
dev_err(priv->dev, "error getting irq resource\n");
- ret = -ENOENT;
+ ret = ndev->irq;
goto clean_ale_ret;
}
@@ -2448,8 +2448,10 @@ static int cpsw_probe(struct platform_device *pdev)
/* RX IRQ */
irq = platform_get_irq(pdev, 1);
- if (irq < 0)
+ if (irq < 0) {
+ ret = irq;
goto clean_ale_ret;
+ }
priv->irqs_table[0] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_rx_interrupt,
@@ -2461,8 +2463,10 @@ static int cpsw_probe(struct platform_device *pdev)
/* TX IRQ */
irq = platform_get_irq(pdev, 2);
- if (irq < 0)
+ if (irq < 0) {
+ ret = irq;
goto clean_ale_ret;
+ }
priv->irqs_table[1] = irq;
ret = devm_request_irq(&pdev->dev, irq, cpsw_tx_interrupt,
next prev parent reply other threads:[~2015-12-26 19:12 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-26 15:28 [PATCH 0/7] " Julia Lawall
2015-12-26 15:28 ` [PATCH 1/7] umem: " Julia Lawall
2015-12-26 15:28 ` [PATCH 2/7] gdrom: " Julia Lawall
2015-12-26 15:28 ` [PATCH 3/7] omapfb: " Julia Lawall
2015-12-29 9:06 ` Tomi Valkeinen
2015-12-26 15:28 ` [PATCH 4/7] usb: gadget: legacy: " Julia Lawall
2015-12-26 15:28 ` [PATCH 5/7] rsxx: " Julia Lawall
2015-12-26 15:28 ` [PATCH 6/7] drivers: net: cpsw: " Julia Lawall
2015-12-26 17:36 ` Sergei Shtylyov
2015-12-26 17:40 ` Julia Lawall
2015-12-26 17:50 ` Sergei Shtylyov
2015-12-26 19:12 ` Julia Lawall [this message]
2015-12-26 19:51 ` Sergei Shtylyov
2015-12-26 20:07 ` Julia Lawall
2015-12-26 20:11 ` Sergei Shtylyov
2015-12-26 15:28 ` [PATCH 7/7] soc: ti: " Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1512262011220.2070@localhost6.localdomain6 \
--to=julia.lawall@lip6.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®