Commit 1a95e04e authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: phylink: remove phylink_helper_basex_speed() 



As there are now no users of phylink_helper_basex_speed(), we can
remove this obsolete functionality.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 17a5f6a7

drivers/net/phy/phylink.c

+0 −28
Original line number Diff line number Diff line
@@ -2778,34 +2778,6 @@ static const struct sfp_upstream_ops sfp_phylink_ops = { 


/* Helpers for MAC drivers */



/**

 * phylink_helper_basex_speed() - 1000BaseX/2500BaseX helper

 * @state: a pointer to a &struct phylink_link_state

 *

 * Inspect the interface mode, advertising mask or forced speed and

 * decide whether to run at 2.5Gbit or 1Gbit appropriately, switching

 * the interface mode to suit.  @state->interface is appropriately

 * updated, and the advertising mask has the "other" baseX_Full flag

 * cleared.

 */

void phylink_helper_basex_speed(struct phylink_link_state *state)

{

	if (phy_interface_mode_is_8023z(state->interface)) {

		bool want_2500 = state->an_enabled ?

			phylink_test(state->advertising, 2500baseX_Full) :

			state->speed == SPEED_2500;



		if (want_2500) {

			phylink_clear(state->advertising, 1000baseX_Full);

			state->interface = PHY_INTERFACE_MODE_2500BASEX;

		} else {

			phylink_clear(state->advertising, 2500baseX_Full);

			state->interface = PHY_INTERFACE_MODE_1000BASEX;

		}

	}

}

EXPORT_SYMBOL_GPL(phylink_helper_basex_speed);



static void phylink_decode_c37_word(struct phylink_link_state *state,

				    uint16_t config_reg, int speed)

{

include/linux/phylink.h

+0 −6
Original line number Diff line number Diff line
@@ -160,11 +160,6 @@ struct phylink_mac_ops { 
 * clearing unsupported speeds and duplex settings. The port modes

 * should not be cleared; phylink_set_port_modes() will help with this.

 *

 * If the @state->interface mode is %PHY_INTERFACE_MODE_1000BASEX

 * or %PHY_INTERFACE_MODE_2500BASEX, select the appropriate mode

 * based on @state->advertising and/or @state->speed and update

 * @state->interface accordingly. See phylink_helper_basex_speed().

 *

 * When @config->supported_interfaces has been set, phylink will iterate

 * over the supported interfaces to determine the full capability of the

 * MAC. The validation function must not print errors if @state->interface
@@ -579,7 +574,6 @@ int phylink_speed_up(struct phylink *pl); 
#define phylink_test(bm, mode)	__phylink_do_bit(test_bit, bm, mode)



void phylink_set_port_modes(unsigned long *bits);

void phylink_helper_basex_speed(struct phylink_link_state *state);



void phylink_mii_c22_pcs_decode_state(struct phylink_link_state *state,

				      u16 bmsr, u16 lpa);