From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 4 Jul 2017 15:09:59 +0000 (+0100)
Subject: net: macb: remove extraneous return when MACB_EXT_DESC is defined
X-Git-Tag: v4.13-rc1~157^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=42af627b400f32e5b17023f39c4fc24107ca8c3d;p=linux-2.6-block.git

net: macb: remove extraneous return when MACB_EXT_DESC is defined

When macro MACB_EXT_DESC is defined we end up with two identical
return statements and just one is sufficient. Remove the extra
return.

Detected by CoverityScan, CID#1449361 ("Structurally dead code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 41e5711544fc..e69ebdd65658 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -146,7 +146,6 @@ static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx
 	default:
 		break;
 	}
-	return desc_idx;
 #endif
 	return desc_idx;
 }