From: Antoine Ténart <antoine.tenart@free-electrons.com>
Date: Wed, 7 Jun 2017 06:17:50 +0000 (+0200)
Subject: net: mvpp2: do not bypass the mvpp22_port_mii_set function
X-Git-Tag: MMI-PSA29.97-13-9~5432^2~58
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e173db36e3090d90651d97ab4bc45ace7f8cc0c6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

net: mvpp2: do not bypass the mvpp22_port_mii_set function

The mvpp22_port_mii_set() function was added by 2697582144dd, but the
function directly returns without doing anything. This return was used
when debugging and wasn't removed before sending the patch. Fix this.

Fixes: 2697582144dd ("net: mvpp2: handle misc PPv2.1/PPv2.2 differences")
Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c
index 9b875d776b29..70bca2a6fb02 100644
--- a/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@ -4186,8 +4186,6 @@ static void mvpp22_port_mii_set(struct mvpp2_port *port)
 {
 	u32 val;
 
-	return;
-
 	/* Only GOP port 0 has an XLG MAC */
 	if (port->gop_id == 0) {
 		val = readl(port->base + MVPP22_XLG_CTRL3_REG);