diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-06-18 12:28:42 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-06-19 11:38:26 +0200 |
| commit | e62dbaff4bc2540393cfc31a7438ed833da7c43c (patch) | |
| tree | 8679f0b8e3e24449ea86cb5e77d95cdce62574f1 /drivers/net/phy/marvell.c | |
| parent | net: phy: use mii_bmcr_encode_fixed() (diff) | |
| download | linux-e62dbaff4bc2540393cfc31a7438ed833da7c43c.tar.xz linux-e62dbaff4bc2540393cfc31a7438ed833da7c43c.zip | |
net: phy: marvell: use mii_bmcr_encode_fixed()
Make use of the newly introduced mii_bmcr_encode_fixed() to get the
BMCR value when setting loopback mode for the 88e1510.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/marvell.c')
| -rw-r--r-- | drivers/net/phy/marvell.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index d777c8851ed6..a714150f5e8c 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1991,15 +1991,9 @@ static int m88e1510_loopback(struct phy_device *phydev, bool enable) int err; if (enable) { - u16 bmcr_ctl = 0, mscr2_ctl = 0; + u16 bmcr_ctl, mscr2_ctl = 0; - if (phydev->speed == SPEED_1000) - bmcr_ctl = BMCR_SPEED1000; - else if (phydev->speed == SPEED_100) - bmcr_ctl = BMCR_SPEED100; - - if (phydev->duplex == DUPLEX_FULL) - bmcr_ctl |= BMCR_FULLDPLX; + bmcr_ctl = mii_bmcr_encode_fixed(phydev->speed, phydev->duplex); err = phy_write(phydev, MII_BMCR, bmcr_ctl); if (err < 0) |