[PATCH v7 net-next 11/14] net: phy: marvell-88q2xxx: switch to mv88q2xxx_config_aneg

Dimitri Fedrau
2024-02-18T07:58:32Z

Switch to mv88q2xxx_config_aneg for Marvell 88Q2220 devices and remove
the mv88q222x_config_aneg function which is basically a copy of the
mv88q2xxx_config_aneg function.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Dimitri Fedrau <dima.fedrau@gmail.com>
---
drivers/net/phy/marvell-88q2xxx.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c
index 5bc36cc68a20..58aa10d35731 100644
--- a/drivers/net/phy/marvell-88q2xxx.c
+++ b/drivers/net/phy/marvell-88q2xxx.c
@@ -686,17 +686,6 @@ static int mv88q222x_soft_reset(struct phy_device *phydev)
return 0;
}

-static int mv88q222x_config_aneg(struct phy_device *phydev)
-{
- int ret;
-
- ret = genphy_c45_config_aneg(phydev);
- if (ret)
- return ret;
-
- return mv88q222x_soft_reset(phydev);
-}
-
static int mv88q222x_revb0_config_init(struct phy_device *phydev)
{
int ret, i;
@@ -839,7 +828,7 @@ static struct phy_driver mv88q2xxx_driver[] = {
.flags = PHY_POLL_CABLE_TEST,
.probe = mv88q2xxx_probe,
.get_features = mv88q2xxx_get_features,
- .config_aneg = mv88q222x_config_aneg,
+ .config_aneg = mv88q2xxx_config_aneg,
.aneg_done = genphy_c45_aneg_done,
.config_init = mv88q222x_revb0_config_init,
.read_status = mv88q2xxx_read_status,
--
2.39.2