diff options
| author | David S. Miller <davem@davemloft.net> | 2016-11-15 22:12:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-11-15 22:12:58 -0500 |
| commit | 3418c6810ec01c0e548d75203c88fb4d6a49a22a (patch) | |
| tree | ba4e9ca0a2cac27664f22de77977200a5a3b97bc | |
| parent | 92547f2be93819fa78d19b862f050dc9d8d72701 (diff) | |
| parent | 8c5385cbb0361dd6538b5b422996c3f1e1c6989d (diff) | |
Merge branch 'amd-xgbe-next'
Tom Lendacky says:
====================
amd-xgbe: AMD XGBE driver updates 2016-11-14
This patch series addresses some minor issues found in the recently
accepted patch series for the AMD XGBE driver.
The following fixes are included in this driver update series:
- Fix how a mask is applied to a Clause 37 register value
- Fix some coccinelle identified warnings
This patch series is based on net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 0ecae7045044..4c5b90eea4af 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c @@ -943,8 +943,8 @@ static void xgbe_an37_init(struct xgbe_prv_data *pdata) /* Set up the Control register */ reg = XMDIO_READ(pdata, MDIO_MMD_VEND2, MDIO_VEND2_AN_CTRL); - reg &= XGBE_AN_CL37_TX_CONFIG_MASK; - reg &= XGBE_AN_CL37_PCS_MODE_MASK; + reg &= ~XGBE_AN_CL37_TX_CONFIG_MASK; + reg &= ~XGBE_AN_CL37_PCS_MODE_MASK; switch (pdata->an_mode) { case XGBE_AN_MODE_CL37: diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 4ba43328d99e..348cc8cf5e74 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c @@ -1766,8 +1766,6 @@ static void xgbe_phy_sfi_mode(struct xgbe_prv_data *pdata) XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 1); else if (phy_data->sfp_cable_len <= 3) XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2); - else if (phy_data->sfp_cable_len <= 5) - XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3); else XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 3); } @@ -2346,7 +2344,8 @@ static bool xgbe_phy_valid_speed(struct xgbe_prv_data *pdata, int speed) static int xgbe_phy_link_status(struct xgbe_prv_data *pdata, int *an_restart) { struct xgbe_phy_data *phy_data = pdata->phy_data; - unsigned int ret, reg; + unsigned int reg; + int ret; *an_restart = 0; |