Commit 7530ea26 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Andrew Lunn
Browse files

net: phylink: remove "using_mac_select_pcs" 



With DSA's implementation of the mac_select_pcs() method removed, we
can now remove the detection of mac_select_pcs() implementation.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 6c48cd04

drivers/net/phy/phylink.c

+2 −10
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ struct phylink { 
	unsigned int pcs_state;



	bool mac_link_dropped;

	bool using_mac_select_pcs;



	struct sfp_bus *sfp_bus;

	bool sfp_may_have_phy;
@@ -654,7 +653,7 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, 
	int ret;



	/* Get the PCS for this interface mode */

	if (pl->using_mac_select_pcs) {

	if (pl->mac_ops->mac_select_pcs) {

		pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);

		if (IS_ERR(pcs))

			return PTR_ERR(pcs);
@@ -1173,7 +1172,7 @@ static void phylink_major_config(struct phylink *pl, bool restart, 
						state->interface,

						state->advertising);



	if (pl->using_mac_select_pcs) {

	if (pl->mac_ops->mac_select_pcs) {

		pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);

		if (IS_ERR(pcs)) {

			phylink_err(pl,
@@ -1689,7 +1688,6 @@ struct phylink *phylink_create(struct phylink_config *config, 
			       phy_interface_t iface,

			       const struct phylink_mac_ops *mac_ops)

{

	bool using_mac_select_pcs = false;

	struct phylink *pl;

	int ret;
@@ -1700,11 +1698,6 @@ struct phylink *phylink_create(struct phylink_config *config, 
		return ERR_PTR(-EINVAL);

	}



	if (mac_ops->mac_select_pcs &&

	    mac_ops->mac_select_pcs(config, PHY_INTERFACE_MODE_NA) !=

	      ERR_PTR(-EOPNOTSUPP))

		using_mac_select_pcs = true;



	pl = kzalloc(sizeof(*pl), GFP_KERNEL);

	if (!pl)

		return ERR_PTR(-ENOMEM);
@@ -1723,7 +1716,6 @@ struct phylink *phylink_create(struct phylink_config *config, 
		return ERR_PTR(-EINVAL);

	}



	pl->using_mac_select_pcs = using_mac_select_pcs;

	pl->phy_state.interface = iface;

	pl->link_interface = iface;

	if (iface == PHY_INTERFACE_MODE_MOCA)