Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2024-12-29 09:13:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

net: phylink: remove "using_mac_select_pcs"

Browse Source 
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: 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:
Russell King (Oracle) 2024-10-16 10:58:44 +01:00 committed by Andrew Lunn
parent 6c48cd044c
commit 7530ea26c8
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/phy/phylink.c
View File

@ -79,7 +79,6 @@ struct phylink {
unsigned int pcs_state; unsigned int pcs_state;
bool mac_link_dropped; bool mac_link_dropped;
bool using_mac_select_pcs;
struct sfp_bus *sfp_bus; struct sfp_bus *sfp_bus;
bool sfp_may_have_phy; bool sfp_may_have_phy;
@ -654,7 +653,7 @@ static int phylink_validate_mac_and_pcs(struct phylink *pl,
int ret; int ret;
/* Get the PCS for this interface mode */ /* 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); pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);
if (IS_ERR(pcs)) if (IS_ERR(pcs))
return PTR_ERR(pcs); return PTR_ERR(pcs);
@ -1173,7 +1172,7 @@ static void phylink_major_config(struct phylink *pl, bool restart,
state->interface, state->interface,
state->advertising); 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); pcs = pl->mac_ops->mac_select_pcs(pl->config, state->interface);
if (IS_ERR(pcs)) { if (IS_ERR(pcs)) {
phylink_err(pl, phylink_err(pl,
@ -1689,7 +1688,6 @@ struct phylink *phylink_create(struct phylink_config *config,
phy_interface_t iface, phy_interface_t iface,
const struct phylink_mac_ops *mac_ops) const struct phylink_mac_ops *mac_ops)
{ {
bool using_mac_select_pcs = false;
struct phylink *pl; struct phylink *pl;
int ret; int ret;
@ -1700,11 +1698,6 @@ struct phylink *phylink_create(struct phylink_config *config,
return ERR_PTR(-EINVAL); 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); pl = kzalloc(sizeof(*pl), GFP_KERNEL);
if (!pl) if (!pl)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -1723,7 +1716,6 @@ struct phylink *phylink_create(struct phylink_config *config,
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
pl->using_mac_select_pcs = using_mac_select_pcs;
pl->phy_state.interface = iface; pl->phy_state.interface = iface;
pl->link_interface = iface; pl->link_interface = iface;
if (iface == PHY_INTERFACE_MODE_MOCA) if (iface == PHY_INTERFACE_MODE_MOCA)