From: Markus Elfring <elfr...@users.sourceforge.net>
Date: Sat, 28 Oct 2017 19:10:08 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfr...@users.sourceforge.net>
---
 drivers/net/ethernet/renesas/ravb_main.c | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/drivers/net/ethernet/renesas/ravb_main.c 
b/drivers/net/ethernet/renesas/ravb_main.c
index a8822a756e08..62dbdf7de6cd 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -2069,10 +2069,9 @@ static int ravb_probe(struct platform_device *pdev)
                irq = platform_get_irq_byname(pdev, "ch22");
        else
                irq = platform_get_irq(pdev, 0);
-       if (irq < 0) {
-               error = irq;
-               goto out_release;
-       }
+       if (irq < 0)
+               goto failure_indication;
+
        ndev->irq = irq;
 
        SET_NETDEV_DEV(ndev, &pdev->dev);
@@ -2101,25 +2100,22 @@ static int ravb_probe(struct platform_device *pdev)
 
        if (chip_id == RCAR_GEN3) {
                irq = platform_get_irq_byname(pdev, "ch24");
-               if (irq < 0) {
-                       error = irq;
-                       goto out_release;
-               }
+               if (irq < 0)
+                       goto failure_indication;
+
                priv->emac_irq = irq;
                for (i = 0; i < NUM_RX_QUEUE; i++) {
                        irq = platform_get_irq_byname(pdev, ravb_rx_irqs[i]);
-                       if (irq < 0) {
-                               error = irq;
-                               goto out_release;
-                       }
+                       if (irq < 0)
+                               goto failure_indication;
+
                        priv->rx_irqs[i] = irq;
                }
                for (i = 0; i < NUM_TX_QUEUE; i++) {
                        irq = platform_get_irq_byname(pdev, ravb_tx_irqs[i]);
-                       if (irq < 0) {
-                               error = irq;
-                               goto out_release;
-                       }
+                       if (irq < 0)
+                               goto failure_indication;
+
                        priv->tx_irqs[i] = irq;
                }
        }
@@ -2226,6 +2222,10 @@ static int ravb_probe(struct platform_device *pdev)
        pm_runtime_put(&pdev->dev);
        pm_runtime_disable(&pdev->dev);
        return error;
+
+failure_indication:
+       error = irq;
+       goto out_release;
 }
 
 static int ravb_remove(struct platform_device *pdev)
-- 
2.14.3

Reply via email to