aqr113c_config_init() is called by AQR113, AQR113C, AQR115C, all Gen4 PHYs. Thus, rename this to aqr_gen4_config_init(). Currently, aqr113c_config_init() calls aqr_gen2_config_init(). Since we've established that these are Gen4 PHYs, it makes sense to inherit the Gen3 feature set as well. Currently, aqr_gen3_config_init() just calls aqr_gen2_config_init(), so we can safely make this extra modification and expect no functional change. Signed-off-by: Vladimir Oltean --- drivers/net/phy/aquantia/aquantia_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c index 52d434283a32..eb4409fdad34 100644 --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c @@ -1028,14 +1028,14 @@ static int aqr111_get_features(struct phy_device *phydev) return 0; } -static int aqr113c_config_init(struct phy_device *phydev) +static int aqr_gen4_config_init(struct phy_device *phydev) { struct aqr107_priv *priv = phydev->priv; int ret; priv->wait_on_global_cfg = true; - ret = aqr_gen2_config_init(phydev); + ret = aqr_gen3_config_init(phydev); if (ret < 0) return ret; @@ -1276,7 +1276,7 @@ static struct phy_driver aqr_driver[] = { .name = "Aquantia AQR113", .probe = aqr107_probe, .get_rate_matching = aqr_gen2_get_rate_matching, - .config_init = aqr113c_config_init, + .config_init = aqr_gen4_config_init, .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, @@ -1300,7 +1300,7 @@ static struct phy_driver aqr_driver[] = { .name = "Aquantia AQR113C", .probe = aqr107_probe, .get_rate_matching = aqr_gen2_get_rate_matching, - .config_init = aqr113c_config_init, + .config_init = aqr_gen4_config_init, .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, @@ -1349,7 +1349,7 @@ static struct phy_driver aqr_driver[] = { .name = "Aquantia AQR115C", .probe = aqr107_probe, .get_rate_matching = aqr_gen2_get_rate_matching, - .config_init = aqr113c_config_init, + .config_init = aqr_gen4_config_init, .config_aneg = aqr_config_aneg, .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, -- 2.34.1