mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2024-12-29 09:13:38 +00:00
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: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Reviewed-by: Vladimir Oltean <olteanv@gmail.com> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
This commit is contained in:
parent
486dc391ef
commit
6c48cd044c
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user