diff mbox series

[net-next,2/4] net: phy: stop exporting feature arrays which aren't used outside phylib

Message ID 01886672-4880-4ca8-b7b0-94d40f6e0ec5@gmail.com (mailing list archive)
State Accepted
Commit d3a0e217f850a768851974a6efbd70f5673bb584
Delegated to: Netdev Maintainers
Headers show
Series net: phy: clean up phy.h | expand

Checks

Context Check Description
netdev/series_format success Posting correctly formatted
netdev/tree_selection success Clearly marked for net-next
netdev/ynl success Generated files up to date; no warnings/errors; no diff in generated;
netdev/fixes_present success Fixes tag not required for -next series
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 1 this patch: 1
netdev/build_tools success Errors and warnings before: 26 (+1) this patch: 26 (+1)
netdev/cc_maintainers success CCed 7 of 7 maintainers
netdev/build_clang success Errors and warnings before: 94 this patch: 94
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/deprecated_api success None detected
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success No Fixes tag
netdev/build_allmodconfig_warn success Errors and warnings before: 362 this patch: 362
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 63 lines checked
netdev/build_clang_rust success No Rust files in patch. Skipping build
netdev/kdoc success Errors and warnings before: 69 this patch: 69
netdev/source_inline success Was 0 now: 0
netdev/contest success net-next-2025-02-14--18-00 (tests: 889)

Commit Message

Heiner Kallweit Feb. 13, 2025, 9:49 p.m. UTC 
Stop exporting feature arrays which aren't used outside phylib.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
 drivers/net/phy/phy_device.c | 22 ++++++----------------
 include/linux/phy.h          |  5 -----
 2 files changed, 6 insertions(+), 21 deletions(-)

Comments

Mateusz Polchlopek Feb. 14, 2025, 11:10 a.m. UTC | #1 
On 2/13/2025 10:49 PM, Heiner Kallweit wrote:
> Stop exporting feature arrays which aren't used outside phylib.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
>   drivers/net/phy/phy_device.c | 22 ++++++----------------
>   include/linux/phy.h          |  5 -----
>   2 files changed, 6 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
> index 14c312ad2..1c10c774b 100644
> --- a/drivers/net/phy/phy_device.c
> +++ b/drivers/net/phy/phy_device.c
> @@ -91,37 +91,28 @@ static const int phy_all_ports_features_array[7] = {
>   	ETHTOOL_LINK_MODE_Backplane_BIT,
>   };
>   
> -const int phy_10_100_features_array[4] = {
> +static const int phy_10_100_features_array[4] = {
>   	ETHTOOL_LINK_MODE_10baseT_Half_BIT,
>   	ETHTOOL_LINK_MODE_10baseT_Full_BIT,
>   	ETHTOOL_LINK_MODE_100baseT_Half_BIT,
>   	ETHTOOL_LINK_MODE_100baseT_Full_BIT,
>   };
> -EXPORT_SYMBOL_GPL(phy_10_100_features_array);
>   
> -const int phy_basic_t1_features_array[3] = {
> +static const int phy_basic_t1_features_array[3] = {
>   	ETHTOOL_LINK_MODE_TP_BIT,
>   	ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,
>   	ETHTOOL_LINK_MODE_100baseT1_Full_BIT,
>   };
> -EXPORT_SYMBOL_GPL(phy_basic_t1_features_array);
>   
> -const int phy_basic_t1s_p2mp_features_array[2] = {
> +static const int phy_basic_t1s_p2mp_features_array[2] = {
>   	ETHTOOL_LINK_MODE_TP_BIT,
>   	ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT,
>   };
> -EXPORT_SYMBOL_GPL(phy_basic_t1s_p2mp_features_array);
>   
> -const int phy_gbit_features_array[2] = {
> +static const int phy_gbit_features_array[2] = {
>   	ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
>   	ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
>   };
> -EXPORT_SYMBOL_GPL(phy_gbit_features_array);
> -
> -const int phy_10gbit_features_array[1] = {
> -	ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
> -};
> -EXPORT_SYMBOL_GPL(phy_10gbit_features_array);
>   
>   static const int phy_eee_cap1_features_array[] = {
>   	ETHTOOL_LINK_MODE_100baseT_Full_BIT,
> @@ -196,9 +187,8 @@ static void features_init(void)
>   	linkmode_set_bit_array(phy_gbit_features_array,
>   			       ARRAY_SIZE(phy_gbit_features_array),
>   			       phy_10gbit_features);
> -	linkmode_set_bit_array(phy_10gbit_features_array,
> -			       ARRAY_SIZE(phy_10gbit_features_array),
> -			       phy_10gbit_features);
> +	linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
> +			 phy_10gbit_features);
>   
>   	linkmode_set_bit_array(phy_eee_cap1_features_array,
>   			       ARRAY_SIZE(phy_eee_cap1_features_array),
> diff --git a/include/linux/phy.h b/include/linux/phy.h
> index 96e427c2c..33e2c2c93 100644
> --- a/include/linux/phy.h
> +++ b/include/linux/phy.h
> @@ -54,11 +54,6 @@ extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init;
>   #define PHY_EEE_CAP2_FEATURES ((unsigned long *)&phy_eee_cap2_features)
>   
>   extern const int phy_basic_ports_array[3];
> -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];
> -extern const int phy_gbit_features_array[2];
> -extern const int phy_10gbit_features_array[1];
>   
>   /*
>    * Set phydev->irq to PHY_POLL if interrupts are not supported,

Reviewed-by: Mateusz Polchlopek <mateusz.polchlopek@intel.com>
Russell King (Oracle) Feb. 14, 2025, 2:52 p.m. UTC | #2 
On Thu, Feb 13, 2025 at 10:49:19PM +0100, Heiner Kallweit wrote:
> Stop exporting feature arrays which aren't used outside phylib.
> 
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>

My grep confirms.

Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

Thanks!
diff mbox series

Patch

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 14c312ad2..1c10c774b 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -91,37 +91,28 @@  static const int phy_all_ports_features_array[7] = {
 	ETHTOOL_LINK_MODE_Backplane_BIT,
 };
 
-const int phy_10_100_features_array[4] = {
+static const int phy_10_100_features_array[4] = {
 	ETHTOOL_LINK_MODE_10baseT_Half_BIT,
 	ETHTOOL_LINK_MODE_10baseT_Full_BIT,
 	ETHTOOL_LINK_MODE_100baseT_Half_BIT,
 	ETHTOOL_LINK_MODE_100baseT_Full_BIT,
 };
-EXPORT_SYMBOL_GPL(phy_10_100_features_array);
 
-const int phy_basic_t1_features_array[3] = {
+static const int phy_basic_t1_features_array[3] = {
 	ETHTOOL_LINK_MODE_TP_BIT,
 	ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,
 	ETHTOOL_LINK_MODE_100baseT1_Full_BIT,
 };
-EXPORT_SYMBOL_GPL(phy_basic_t1_features_array);
 
-const int phy_basic_t1s_p2mp_features_array[2] = {
+static const int phy_basic_t1s_p2mp_features_array[2] = {
 	ETHTOOL_LINK_MODE_TP_BIT,
 	ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT,
 };
-EXPORT_SYMBOL_GPL(phy_basic_t1s_p2mp_features_array);
 
-const int phy_gbit_features_array[2] = {
+static const int phy_gbit_features_array[2] = {
 	ETHTOOL_LINK_MODE_1000baseT_Half_BIT,
 	ETHTOOL_LINK_MODE_1000baseT_Full_BIT,
 };
-EXPORT_SYMBOL_GPL(phy_gbit_features_array);
-
-const int phy_10gbit_features_array[1] = {
-	ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
-};
-EXPORT_SYMBOL_GPL(phy_10gbit_features_array);
 
 static const int phy_eee_cap1_features_array[] = {
 	ETHTOOL_LINK_MODE_100baseT_Full_BIT,
@@ -196,9 +187,8 @@  static void features_init(void)
 	linkmode_set_bit_array(phy_gbit_features_array,
 			       ARRAY_SIZE(phy_gbit_features_array),
 			       phy_10gbit_features);
-	linkmode_set_bit_array(phy_10gbit_features_array,
-			       ARRAY_SIZE(phy_10gbit_features_array),
-			       phy_10gbit_features);
+	linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,
+			 phy_10gbit_features);
 
 	linkmode_set_bit_array(phy_eee_cap1_features_array,
 			       ARRAY_SIZE(phy_eee_cap1_features_array),
diff --git a/include/linux/phy.h b/include/linux/phy.h
index 96e427c2c..33e2c2c93 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -54,11 +54,6 @@  extern __ETHTOOL_DECLARE_LINK_MODE_MASK(phy_eee_cap2_features) __ro_after_init;
 #define PHY_EEE_CAP2_FEATURES ((unsigned long *)&phy_eee_cap2_features)
 
 extern const int phy_basic_ports_array[3];
-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];
-extern const int phy_gbit_features_array[2];
-extern const int phy_10gbit_features_array[1];
 
 /*
  * Set phydev->irq to PHY_POLL if interrupts are not supported,