ethtool: thunder_bgx: use ethtool.h constants for speed and duplex
authorMichael Zhivich <mzhivich@akamai.com>
Mon, 8 Apr 2019 19:00:46 +0000 (15:00 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 8 Apr 2019 23:37:40 +0000 (16:37 -0700)
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cavium/thunder/thunder_bgx.c

index 673c57b8023fe3e2113cc1121f15d6700d12faa1..81c281ada63b32bab35fa1da242852c0bb83135f 100644 (file)
@@ -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;
                        }