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

net: phylink: remove use of pl->pcs in phylink_validate_mac_and_pcs() 



When the mac_select_pcs() method is not implemented, there is no way
for pl->pcs to be set to a non-NULL value. This was here to support
the old phylink_set_pcs() method which has been removed a few years
ago. Simplify the code in phylink_validate_mac_and_pcs().

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 486dc391

drivers/net/phy/phylink.c

+1 −3
Original line number Diff line number Diff line
@@ -649,8 +649,8 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, 
					unsigned long *supported,

					struct phylink_link_state *state)

{

	struct phylink_pcs *pcs = NULL;

	unsigned long capabilities;

	struct phylink_pcs *pcs;

	int ret;



	/* Get the PCS for this interface mode */
@@ -658,8 +658,6 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl, 
		pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);

		if (IS_ERR(pcs))

			return PTR_ERR(pcs);

	} else {

		pcs = pl->pcs;

	}



	if (pcs) {