net: phy: marvell-88q2xxx: switch to mv88q2xxx_config_aneg

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>
Link: https://lore.kernel.org/r/20240218075753.18067-12-dima.fedrau@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/marvell-88q2xxx.c b/drivers/net/phy/marvell-88q2xxx.c
index 5bc36cc68a20156df7470b44b9bfdd6312cb8700..58aa10d35731032f43cd1b187b220a2c9469772f 100644 (file)
--- 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,