[PATCH 6/7 v2] drivers: net: cpsw: fix error return code

From	Julia Lawall <julia.lawall@lip6.fr>
Newsgroups	linux.kernel
Subject	[PATCH 6/7 v2] drivers: net: cpsw: fix error return code
Date	2015-12-26 20:20 +0100
Message-ID	<qK2xI-4Uu-1@gated-at.bofh.it> (permalink)
References	<qJZgt-2JU-5@gated-at.bofh.it> <qJZgt-2JU-17@gated-at.bofh.it> <qK0YW-3PM-5@gated-at.bofh.it> <qK18C-3TX-7@gated-at.bofh.it> <qK1ih-3Yh-1@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Thread

[PATCH 0/7] fix error return code Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-26 16:50 +0100
  [PATCH 6/7] drivers: net: cpsw: fix error return code Julia Lawall <Julia.Lawall@lip6.fr> - 2015-12-26 16:50 +0100
    Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-26 18:40 +0100
      Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Julia Lawall <julia.lawall@lip6.fr> - 2015-12-26 18:50 +0100
        Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-26 19:00 +0100
          [PATCH 6/7 v2] drivers: net: cpsw: fix error return code Julia Lawall <julia.lawall@lip6.fr> - 2015-12-26 20:20 +0100
          Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-26 21:00 +0100
            Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Julia Lawall <julia.lawall@lip6.fr> - 2015-12-26 21:10 +0100
              Re: [PATCH 6/7] drivers: net: cpsw: fix error return code Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2015-12-26 21:20 +0100

csiph-web