net: phy: remove leftovers from switch to linkmode bitmaps
Subsystems (3)
Heiner Kallweit
maintainerPATCH 1/1 net: phy: remove leftovers from switch to linkmode bitmaps
We have some leftovers from the switch to linkmode bitmaps which
- have never been used
- are not used any longer
- have no user outside phy_device.c
So remove them.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/phy/phy_device.c | 54 ++---------------------------------- include/linux/phy.h | 18 ------------ 2 files changed, 2 insertions(+), 70 deletions(-)
drivers/net/phy/phy_device.c +2 -52
@@ -60,15 +60,9 @@ EXPORT_SYMBOL_GPL(phy_gbit_features);__ETHTOOL_DECLARE_LINK_MODE_MASK (phy_gbit_fibre_features)__ro_after_init ;EXPORT_SYMBOL_GPL (phy_gbit_fibre_features); -__ETHTOOL_DECLARE_LINK_MODE_MASK (phy_gbit_all_ports_features)__ro_after_init ; -EXPORT_SYMBOL_GPL (phy_gbit_all_ports_features); -__ETHTOOL_DECLARE_LINK_MODE_MASK (phy_10gbit_features)__ro_after_init ;EXPORT_SYMBOL_GPL (phy_10gbit_features); -__ETHTOOL_DECLARE_LINK_MODE_MASK (phy_10gbit_fec_features)__ro_after_init ; -EXPORT_SYMBOL_GPL (phy_10gbit_fec_features); -const int phy_basic_ports_array[3 ] = { ETHTOOL_LINK_MODE_Autoneg_BIT,ETHTOOL_LINK_MODE_TP_BIT ,
@@ -76,12 +70,7 @@ const int phy_basic_ports_array[3] = { };EXPORT_SYMBOL_GPL (phy_basic_ports_array); -const int phy_fibre_port_array[1 ] = { -ETHTOOL_LINK_MODE_FIBRE_BIT , -}; -EXPORT_SYMBOL_GPL (phy_fibre_port_array); - -const int phy_all_ports_features_array[7 ] = { +static const int phy_all_ports_features_array[7 ] = { ETHTOOL_LINK_MODE_Autoneg_BIT,ETHTOOL_LINK_MODE_TP_BIT ,ETHTOOL_LINK_MODE_MII_BIT ,
@@ -90,7 +79,6 @@ const int phy_all_ports_features_array[7] = {ETHTOOL_LINK_MODE_BNC_BIT , ETHTOOL_LINK_MODE_Backplane_BIT, }; -EXPORT_SYMBOL_GPL (phy_all_ports_features_array);const int phy_10_100_features_array[4 ] = { ETHTOOL_LINK_MODE_10baseT_Half_BIT,
@@ -124,20 +112,6 @@ const int phy_10gbit_features_array[1] = { };EXPORT_SYMBOL_GPL (phy_10gbit_features_array); -static const int phy_10gbit_fec_features_array[1 ] = { - ETHTOOL_LINK_MODE_10000baseR_FEC_BIT, -}; - -__ETHTOOL_DECLARE_LINK_MODE_MASK (phy_10gbit_full_features)__ro_after_init ; -EXPORT_SYMBOL_GPL (phy_10gbit_full_features); - -static const int phy_10gbit_full_features_array[] = { - ETHTOOL_LINK_MODE_10baseT_Full_BIT, - ETHTOOL_LINK_MODE_100baseT_Full_BIT, - ETHTOOL_LINK_MODE_1000baseT_Full_BIT, - ETHTOOL_LINK_MODE_10000baseT_Full_BIT, -}; -static const int phy_eee_cap1_features_array[] = { ETHTOOL_LINK_MODE_100baseT_Full_BIT, ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
@@ -199,20 +173,7 @@ static void features_init(void)linkmode_set_bit_array (phy_gbit_features_array,ARRAY_SIZE (phy_gbit_features_array), phy_gbit_fibre_features); -linkmode_set_bit_array (phy_fibre_port_array, -ARRAY_SIZE (phy_fibre_port_array), - phy_gbit_fibre_features); - -/* 10/100 half/full + 1000 half/full + TP/MII/FIBRE/AUI/BNC/Backplane*/ -linkmode_set_bit_array (phy_all_ports_features_array, -ARRAY_SIZE (phy_all_ports_features_array), - phy_gbit_all_ports_features); -linkmode_set_bit_array (phy_10_100_features_array, -ARRAY_SIZE (phy_10_100_features_array), - phy_gbit_all_ports_features); -linkmode_set_bit_array (phy_gbit_features_array, -ARRAY_SIZE (phy_gbit_features_array), - phy_gbit_all_ports_features); +linkmode_set_bit (ETHTOOL_LINK_MODE_FIBRE_BIT , phy_gbit_fibre_features);/* 10/100 half/full + 1000 half/full + 10G full*/ linkmode_set_bit_array(phy_all_ports_features_array,
@@ -228,17 +189,6 @@ static void features_init(void)ARRAY_SIZE (phy_10gbit_features_array), phy_10gbit_features); -/* 10/100/1000/10G full */ -linkmode_set_bit_array (phy_all_ports_features_array, -ARRAY_SIZE (phy_all_ports_features_array), - phy_10gbit_full_features); -linkmode_set_bit_array (phy_10gbit_full_features_array, -ARRAY_SIZE (phy_10gbit_full_features_array), - phy_10gbit_full_features); -/* 10G FEC only */ -linkmode_set_bit_array (phy_10gbit_fec_features_array, -ARRAY_SIZE (phy_10gbit_fec_features_array), - phy_10gbit_fec_features);linkmode_set_bit_array (phy_eee_cap1_features_array,ARRAY_SIZE (phy_eee_cap1_features_array), phy_eee_cap1_features);
include/linux/phy.h +0 -18
@@ -32,19 +32,6 @@#include <linux/atomic.h> #include <net/eee.h> -#define PHY_DEFAULT_FEATURES (SUPPORTED_Autoneg | \ - SUPPORTED_TP | \ - SUPPORTED_MII) - -#define PHY_10BT_FEATURES (SUPPORTED_10baseT_Half | \ - SUPPORTED_10baseT_Full) - -#define PHY_100BT_FEATURES (SUPPORTED_100baseT_Half | \ - SUPPORTED_100baseT_Full) - -#define PHY_1000BT_FEATURES (SUPPORTED_1000baseT_Half | \ - SUPPORTED_1000baseT_Full) -extern __ETHTOOL_DECLARE_LINK_MODE_MASK (phy_basic_features)__ro_after_init ;extern __ETHTOOL_DECLARE_LINK_MODE_MASK (phy_basic_t1_features)__ro_after_init ;extern __ETHTOOL_DECLARE_LINK_MODE_MASK (phy_basic_t1s_p2mp_features)__ro_after_init ;
@@ -62,16 +49,11 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init;#define PHY_BASIC_T1S_P2MP_FEATURES ((unsigned long *)&phy_basic_t1s_p2mp_features)#define PHY_GBIT_FEATURES ((unsigned long *)&phy_gbit_features)#define PHY_GBIT_FIBRE_FEATURES ((unsigned long *)&phy_gbit_fibre_features) -#define PHY_GBIT_ALL_PORTS_FEATURES ((unsigned long *)&phy_gbit_all_ports_features)#define PHY_10GBIT_FEATURES ((unsigned long *)&phy_10gbit_features) -#define PHY_10GBIT_FEC_FEATURES ((unsigned long *)&phy_10gbit_fec_features) -#define PHY_10GBIT_FULL_FEATURES ((unsigned long *)&phy_10gbit_full_features)#define PHY_EEE_CAP1_FEATURES ((unsigned long *)&phy_eee_cap1_features)#define PHY_EEE_CAP2_FEATURES ((unsigned long *)&phy_eee_cap2_features)extern const int phy_basic_ports_array[3 ]; -extern const int phy_fibre_port_array[1 ]; -extern const int phy_all_ports_features_array[7 ];extern const int phy_10_100_features_array[4 ];extern const int phy_basic_t1_features_array[3 ];extern const int phy_basic_t1s_p2mp_features_array[2 ];
Signature · 1 line
2.48.1
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 16 Jan 2025 22:38:40 +0100 you wrote:
We have some leftovers from the switch to linkmode bitmaps which
- have never been used
- are not used any longer
- have no user outsidephy_device.c
So remove them.Signed-off-by Heiner Kallweit <[email protected]>[...]
Here is the summary with links:
- [net-next] net: phy: remove leftovers from switch to linkmode bitmaps
https://git.kernel.org/netdev/net-next/c/12d5151be010
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html