[PATCH] ethtool: thunder_bgx: use ethtool.h constants for speed and duplex

[PATCH] ethtool: thunder_bgx: use ethtool.h constants for speed and duplex

[Michael Zhivich]

Use constants provided by ethtool.h for speed and duplex values
instead of raw integer constants to increase code readability.

thunder_bgx already uses SPEED_UNKNOWN and DUPLEX_UNKNOWN constants,
also provided by ethtool.h.

Signed-off-by: Michael Zhivich <mzhivich@akamai.com>
---
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
index 673c57b..81c281a 100644
--- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -962,13 +962,13 @@ static void bgx_poll_for_sgmii_link(struct lmac *lmac)
 	lmac->last_duplex = (an_result >> 1) & 0x1;
 	switch (speed) {
 	case 0:
-		lmac->last_speed = 10;
+		lmac->last_speed = SPEED_10;
 		break;
 	case 1:
-		lmac->last_speed = 100;
+		lmac->last_speed = SPEED_100;
 		break;
 	case 2:
-		lmac->last_speed = 1000;
+		lmac->last_speed = SPEED_1000;
 		break;
 	default:
 		lmac->link_up = false;
@@ -1012,10 +1012,10 @@ static void bgx_poll_for_link(struct work_struct *work)
 	    !(smu_link & SMU_RX_CTL_STATUS)) {
 		lmac->link_up = 1;
 		if (lmac->lmac_type == BGX_MODE_XLAUI)
-			lmac->last_speed = 40000;
+			lmac->last_speed = SPEED_40000;
 		else
-			lmac->last_speed = 10000;
-		lmac->last_duplex = 1;
+			lmac->last_speed = SPEED_10000;
+		lmac->last_duplex = DUPLEX_FULL;
 	} else {
 		lmac->link_up = 0;
 		lmac->last_speed = SPEED_UNKNOWN;
@@ -1105,8 +1105,8 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid)
 			} else {
 				/* Default to below link speed and duplex */
 				lmac->link_up = true;
-				lmac->last_speed = 1000;
-				lmac->last_duplex = 1;
+				lmac->last_speed = SPEED_1000;
+				lmac->last_duplex = DUPLEX_FULL;
 				bgx_sgmii_change_link_state(lmac);
 				return 0;
 			}
-- 
2.7.4

Re: [PATCH] ethtool: thunder_bgx: use ethtool.h constants for speed and duplex

[Andrew Lunn]

On Mon, Apr 08, 2019 at 03:00:46PM -0400, Michael Zhivich wrote:
> Use constants provided by ethtool.h for speed and duplex values
> instead of raw integer constants to increase code readability.
> 
> thunder_bgx already uses SPEED_UNKNOWN and DUPLEX_UNKNOWN constants,
> also provided by ethtool.h.
> 
> Signed-off-by: Michael Zhivich <mzhivich@akamai.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

Re: [PATCH] ethtool: thunder_bgx: use ethtool.h constants for speed and duplex

[David Miller]

From: Michael Zhivich <mzhivich@akamai.com>
Date: Mon, 8 Apr 2019 15:00:46 -0400

> Use constants provided by ethtool.h for speed and duplex values
> instead of raw integer constants to increase code readability.
> 
> thunder_bgx already uses SPEED_UNKNOWN and DUPLEX_UNKNOWN constants,
> also provided by ethtool.h.
> 
> Signed-off-by: Michael Zhivich <mzhivich@akamai.com>

Applied.