Change getting the speed to use FIELD_GET() too to be in line with the
rest of the code.

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/phy/aquantia.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/phy/aquantia.c b/drivers/net/phy/aquantia.c
index 7dfcbae4f..d8332b128 100644
--- a/drivers/net/phy/aquantia.c
+++ b/drivers/net/phy/aquantia.c
@@ -21,13 +21,13 @@
 #define PHY_ID_AQR405  0x03a1b4b0
 
 #define MDIO_AN_TX_VEND_STATUS1                        0xc800
-#define MDIO_AN_TX_VEND_STATUS1_10BASET                (0x0 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_100BASETX      (0x1 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_1000BASET      (0x2 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_10GBASET       (0x3 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_2500BASET      (0x4 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_5000BASET      (0x5 << 1)
-#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK      (0x7 << 1)
+#define MDIO_AN_TX_VEND_STATUS1_RATE_MASK      GENMASK(3, 1)
+#define MDIO_AN_TX_VEND_STATUS1_10BASET                0
+#define MDIO_AN_TX_VEND_STATUS1_100BASETX      1
+#define MDIO_AN_TX_VEND_STATUS1_1000BASET      2
+#define MDIO_AN_TX_VEND_STATUS1_10GBASET       3
+#define MDIO_AN_TX_VEND_STATUS1_2500BASET      4
+#define MDIO_AN_TX_VEND_STATUS1_5000BASET      5
 #define MDIO_AN_TX_VEND_STATUS1_FULL_DUPLEX    BIT(0)
 
 #define MDIO_AN_TX_VEND_INT_STATUS2            0xcc01
@@ -148,7 +148,7 @@ static int aqr_read_status(struct phy_device *phydev)
        mdelay(10);
        reg = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_STATUS1);
 
-       switch (reg & MDIO_AN_TX_VEND_STATUS1_RATE_MASK) {
+       switch (FIELD_GET(MDIO_AN_TX_VEND_STATUS1_RATE_MASK, reg)) {
        case MDIO_AN_TX_VEND_STATUS1_10GBASET:
                phydev->speed = SPEED_10000;
                break;
-- 
2.20.1


Reply via email to