diff options
| author |   Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-10-17 12:52:54 +0100 |
|---|---|---|
| committer |   Paolo Abeni <pabeni@redhat.com> | 2024-10-23 16:10:16 +0200 |
| commit | 1c17f9d3fe17d296ff2d93740ee96a52a2343628 (patch) | |
| tree | 9e70af2780fe4f24c8a86ddc798db3719cffb68b | |
| parent | net: pcs: xpcs: rearrange xpcs_link_up_1000basex() (diff) | |
| download | wireguard-linux-1c17f9d3fe17d296ff2d93740ee96a52a2343628.tar.xz wireguard-linux-1c17f9d3fe17d296ff2d93740ee96a52a2343628.zip | |
net: pcs: xpcs: replace open-coded mii_bmcr_encode_fixed()
We can now see that we have an open-coded version of
mii_bmcr_encode_fixed() when this is called with SPEED_1000:
val = BMCR_SPEED1000;
if (duplex == DUPLEX_FULL)
val |= BMCR_FULLDPLX;
Replace this with a call to mii_bmcr_encode_fixed().
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Tested-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
| -rw-r--r-- | drivers/net/pcs/pcs-xpcs.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/pcs/pcs-xpcs.c b/drivers/net/pcs/pcs-xpcs.c index 3222b8851bff..5b38f9019f83 100644 --- a/drivers/net/pcs/pcs-xpcs.c +++ b/drivers/net/pcs/pcs-xpcs.c @@ -1137,10 +1137,7 @@ static void xpcs_link_up_1000basex(struct dw_xpcs *xpcs, unsigned int neg_mode, dev_err(&xpcs->mdiodev->dev, "%s: half duplex not supported\n", __func__); - val = BMCR_SPEED1000; - if (duplex == DUPLEX_FULL) - val |= BMCR_FULLDPLX; - + val = mii_bmcr_encode_fixed(speed, duplex); ret = xpcs_write(xpcs, MDIO_MMD_VEND2, MII_BMCR, val); if (ret) dev_err(&xpcs->mdiodev->dev, "%s: xpcs_write returned %pe\n", |