net: phy: aquantia: remove downshift warning now that phylib takes care
authorHeiner Kallweit <hkallweit1@gmail.com>
Fri, 20 Mar 2020 16:52:53 +0000 (17:52 +0100)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2020 04:09:47 +0000 (21:09 -0700)
Now that phylib notifies the user of a downshift we can remove
this functionality from the driver.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/phy/aquantia_main.c

index 31927b2..837d5ea 100644 (file)
@@ -290,17 +290,6 @@ static int aqr_read_status(struct phy_device *phydev)
        return genphy_c45_read_status(phydev);
 }
 
-static int aqr107_read_downshift_event(struct phy_device *phydev)
-{
-       int val;
-
-       val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_TX_VEND_INT_STATUS1);
-       if (val < 0)
-               return val;
-
-       return !!(val & MDIO_AN_TX_VEND_INT_STATUS1_DOWNSHIFT);
-}
-
 static int aqr107_read_rate(struct phy_device *phydev)
 {
        int val;
@@ -377,13 +366,7 @@ static int aqr107_read_status(struct phy_device *phydev)
                break;
        }
 
-       val = aqr107_read_downshift_event(phydev);
-       if (val <= 0)
-               return val;
-
-       phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n");
-
-       /* Read downshifted rate from vendor register */
+       /* Read possibly downshifted rate from vendor register */
        return aqr107_read_rate(phydev);
 }
 
@@ -506,9 +489,6 @@ static int aqr107_config_init(struct phy_device *phydev)
        if (!ret)
                aqr107_chip_info(phydev);
 
-       /* ensure that a latched downshift event is cleared */
-       aqr107_read_downshift_event(phydev);
-
        return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);
 }
 
@@ -533,9 +513,6 @@ static int aqcs109_config_init(struct phy_device *phydev)
        if (ret)
                return ret;
 
-       /* ensure that a latched downshift event is cleared */
-       aqr107_read_downshift_event(phydev);
-
        return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);
 }