From: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Date: Thu, 17 Oct 2024 11:52:49 +0000 (+0100)
Subject: net: pcs: xpcs: rearrange xpcs_link_up_1000basex()
X-Git-Tag: v6.13-rc1~135^2~234^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b61a465a761921d11f99492ce41b85cfba7d6161;p=thirdparty%2Fkernel%2Flinux.git

net: pcs: xpcs: rearrange xpcs_link_up_1000basex()

Rearrange xpcs_link_up_1000basex() to make it more obvious what will
happen in the following commit.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---

diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c
index 183df8f8c50fd..3222b8851bff4 100644
--- a/drivers/net/pcs/pcs-xpcs.c
+++ b/drivers/net/pcs/pcs-xpcs.c
@@ -1133,12 +1133,13 @@ static void xpcs_link_up_1000basex(struct dw_xpcs *xpcs, unsigned int neg_mode,
 		return;
 	}
 
+	if (duplex != DUPLEX_FULL)
+		dev_err(&xpcs->mdiodev->dev, "%s: half duplex not supported\n",
+			__func__);
+
 	val = BMCR_SPEED1000;
 	if (duplex == DUPLEX_FULL)
 		val |= BMCR_FULLDPLX;
-	else
-		dev_err(&xpcs->mdiodev->dev, "%s: half duplex not supported\n",
-			__func__);
 
 	ret = xpcs_write(xpcs, MDIO_MMD_VEND2, MII_BMCR, val);
 	if (ret)