Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-phy-remove-genphy_config_eee_advert'
Heiner Kallweit says:
====================
net: phy: remove genphy_config_eee_advert
This series removes genphy_config_eee_advert().
Note: The change to bcm_config_lre_aneg() is compile-tested only
as I don't have supported hardware.
====================
Link: https://patch.msgid.link/69d22b31-57d1-4b01-bfde-0c6a1df1e310@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+4
-27
+1
-1
drivers/net/phy/bcm-phy-lib.c
+1
-1
drivers/net/phy/bcm-phy-lib.c
+3
-1
drivers/net/phy/phy-c45.c
+3
-1
drivers/net/phy/phy-c45.c
···
680
680
* @phydev: target phy_device struct
681
681
* @adv: the linkmode advertisement settings
682
682
*/
683
-
int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv)
683
+
static int genphy_c45_write_eee_adv(struct phy_device *phydev,
684
+
unsigned long *adv)
684
685
{
685
686
int val, changed = 0;
686
687
···
951
950
952
951
return genphy_c45_write_eee_adv(phydev, phydev->advertising_eee);
953
952
}
953
+
EXPORT_SYMBOL_GPL(genphy_c45_an_config_eee_aneg);
954
954
955
955
/**
956
956
* genphy_c45_pma_baset1_read_abilities - read supported baset1 link modes from PMA
-23
drivers/net/phy/phy_device.c
-23
drivers/net/phy/phy_device.c
···
2240
2240
}
2241
2241
2242
2242
/**
2243
-
* genphy_config_eee_advert - disable unwanted eee mode advertisement
2244
-
* @phydev: target phy_device struct
2245
-
*
2246
-
* Description: Writes MDIO_AN_EEE_ADV after disabling unsupported energy
2247
-
* efficent ethernet modes. Returns 0 if the PHY's advertisement hasn't
2248
-
* changed, and 1 if it has changed.
2249
-
*/
2250
-
int genphy_config_eee_advert(struct phy_device *phydev)
2251
-
{
2252
-
int err;
2253
-
2254
-
/* Nothing to disable */
2255
-
if (!phydev->eee_broken_modes)
2256
-
return 0;
2257
-
2258
-
err = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV,
2259
-
phydev->eee_broken_modes, 0);
2260
-
/* If the call failed, we assume that EEE is not supported */
2261
-
return err < 0 ? 0 : err;
2262
-
}
2263
-
EXPORT_SYMBOL(genphy_config_eee_advert);
2264
-
2265
-
/**
2266
2243
* genphy_setup_forced - configures/forces speed/duplex from @phydev
2267
2244
* @phydev: target phy_device struct
2268
2245
*
-2
include/linux/phy.h
-2
include/linux/phy.h
···
1885
1885
int genphy_setup_forced(struct phy_device *phydev);
1886
1886
int genphy_restart_aneg(struct phy_device *phydev);
1887
1887
int genphy_check_and_restart_aneg(struct phy_device *phydev, bool restart);
1888
-
int genphy_config_eee_advert(struct phy_device *phydev);
1889
1888
int __genphy_config_aneg(struct phy_device *phydev, bool changed);
1890
1889
int genphy_aneg_done(struct phy_device *phydev);
1891
1890
int genphy_update_link(struct phy_device *phydev);
···
1952
1953
struct ethtool_keee *data);
1953
1954
int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
1954
1955
struct ethtool_keee *data);
1955
-
int genphy_c45_write_eee_adv(struct phy_device *phydev, unsigned long *adv);
1956
1956
int genphy_c45_an_config_eee_aneg(struct phy_device *phydev);
1957
1957
int genphy_c45_read_eee_adv(struct phy_device *phydev, unsigned long *adv);
1958
1958