Commit 743f6397 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phylink: remove a bunch of unused validation methods 



Remove exports for phylink_caps_to_linkmodes(),
phylink_get_capabilities(), phylink_validate_mask_caps() and
phylink_generic_validate(). Also, as phylink_generic_validate() is no
longer called, we can remove its implementation as well.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1qsPkK-009wip-W9@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent da5f6b80

drivers/net/phy/phylink.c

+8 −27
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ static int phylink_interface_max_speed(phy_interface_t interface) 
 * Set all possible pause, speed and duplex linkmodes in @linkmodes that are

 * supported by the @caps. @linkmodes must have been initialised previously.

 */

void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps)

static void phylink_caps_to_linkmodes(unsigned long *linkmodes,

				      unsigned long caps)

{

	if (caps & MAC_SYM_PAUSE)

		__set_bit(ETHTOOL_LINK_MODE_Pause_BIT, linkmodes);
@@ -400,7 +401,6 @@ void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps) 
		__set_bit(ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, linkmodes);

	}

}

EXPORT_SYMBOL_GPL(phylink_caps_to_linkmodes);



static struct {

	unsigned long mask;
@@ -477,7 +477,7 @@ static unsigned long phylink_cap_from_speed_duplex(int speed, 
 * Get the MAC capabilities that are supported by the @interface mode and

 * @mac_capabilities.

 */

unsigned long phylink_get_capabilities(phy_interface_t interface,

static unsigned long phylink_get_capabilities(phy_interface_t interface,

					      unsigned long mac_capabilities,

					      int rate_matching)

{
@@ -606,7 +606,6 @@ unsigned long phylink_get_capabilities(phy_interface_t interface, 


	return (caps & mac_capabilities) | matched_caps;

}

EXPORT_SYMBOL_GPL(phylink_get_capabilities);



/**

 * phylink_validate_mask_caps() - Restrict link modes based on caps
@@ -618,7 +617,7 @@ EXPORT_SYMBOL_GPL(phylink_get_capabilities); 
 * @supported and @state based on that. Use this function if your capabiliies

 * aren't constant, such as if they vary depending on the interface.

 */

void phylink_validate_mask_caps(unsigned long *supported,

static void phylink_validate_mask_caps(unsigned long *supported,

				       struct phylink_link_state *state,

				       unsigned long mac_capabilities)

{
@@ -634,24 +633,6 @@ void phylink_validate_mask_caps(unsigned long *supported, 
	linkmode_and(supported, supported, mask);

	linkmode_and(state->advertising, state->advertising, mask);

}

EXPORT_SYMBOL_GPL(phylink_validate_mask_caps);



/**

 * phylink_generic_validate() - generic validate() callback implementation

 * @config: a pointer to a &struct phylink_config.

 * @supported: ethtool bitmask for supported link modes.

 * @state: a pointer to a &struct phylink_link_state.

 *

 * Generic implementation of the validate() callback that MAC drivers can

 * use when they pass the range of supported interfaces and MAC capabilities.

 */

void phylink_generic_validate(struct phylink_config *config,

			      unsigned long *supported,

			      struct phylink_link_state *state)

{

	phylink_validate_mask_caps(supported, state, config->mac_capabilities);

}

EXPORT_SYMBOL_GPL(phylink_generic_validate);



static int phylink_validate_mac_and_pcs(struct phylink *pl,

					unsigned long *supported,

include/linux/phylink.h

+0 −11
Original line number Diff line number Diff line
@@ -613,17 +613,6 @@ void pcs_link_up(struct phylink_pcs *pcs, unsigned int neg_mode, 
		 phy_interface_t interface, int speed, int duplex);

#endif



void phylink_caps_to_linkmodes(unsigned long *linkmodes, unsigned long caps);

unsigned long phylink_get_capabilities(phy_interface_t interface,

				       unsigned long mac_capabilities,

				       int rate_matching);

void phylink_validate_mask_caps(unsigned long *supported,

				struct phylink_link_state *state,

				unsigned long caps);

void phylink_generic_validate(struct phylink_config *config,

			      unsigned long *supported,

			      struct phylink_link_state *state);



struct phylink *phylink_create(struct phylink_config *,

			       const struct fwnode_handle *,

			       phy_interface_t,