Skip to content

Commit

Permalink
net: phy: aquantia: remove downshift warning now that phylib takes care
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Heiner Kallweit authored and David S. Miller committed Mar 24, 2020
1 parent efbd721 commit 1ec32eb
Showing 1 changed file with 1 addition and 24 deletions.
25 changes: 1 addition & 24 deletions drivers/net/phy/aquantia_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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);
}

Expand All @@ -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);
}

Expand Down

0 comments on commit 1ec32eb

Please sign in to comment.