Commit 1ec32eb6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: aquantia: remove downshift warning now that phylib takes care

Now that phylib notifies the user of a downshift we can remove
this functionality from the driver.
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent efbd721e
...@@ -290,17 +290,6 @@ static int aqr_read_status(struct phy_device *phydev) ...@@ -290,17 +290,6 @@ static int aqr_read_status(struct phy_device *phydev)
return genphy_c45_read_status(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) static int aqr107_read_rate(struct phy_device *phydev)
{ {
int val; int val;
...@@ -377,13 +366,7 @@ static int aqr107_read_status(struct phy_device *phydev) ...@@ -377,13 +366,7 @@ static int aqr107_read_status(struct phy_device *phydev)
break; break;
} }
val = aqr107_read_downshift_event(phydev); /* Read possibly downshifted rate from vendor register */
if (val <= 0)
return val;
phydev_warn(phydev, "Downshift occurred! Cabling may be defective.\n");
/* Read downshifted rate from vendor register */
return aqr107_read_rate(phydev); return aqr107_read_rate(phydev);
} }
...@@ -506,9 +489,6 @@ static int aqr107_config_init(struct phy_device *phydev) ...@@ -506,9 +489,6 @@ static int aqr107_config_init(struct phy_device *phydev)
if (!ret) if (!ret)
aqr107_chip_info(phydev); 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); return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);
} }
...@@ -533,9 +513,6 @@ static int aqcs109_config_init(struct phy_device *phydev) ...@@ -533,9 +513,6 @@ static int aqcs109_config_init(struct phy_device *phydev)
if (ret) if (ret)
return 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); return aqr107_set_downshift(phydev, MDIO_AN_VEND_PROV_DOWNSHIFT_DFLT);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment