Skip to content

Commit

Permalink
net: sparx5: use .mac_select_pcs() interface
Browse files Browse the repository at this point in the history
Convert sparx5 to use the mac_select_interface rather than using
phylink_set_pcs(). The intention here is to unify the approach for
PCS and eventually remove phylink_set_pcs().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Russell King (Oracle) authored and David S. Miller committed Jan 28, 2022
1 parent e7d7863 commit 9c8c440
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
1 change: 0 additions & 1 deletion drivers/net/ethernet/microchip/sparx5/sparx5_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ static int sparx5_create_port(struct sparx5 *sparx5,
return PTR_ERR(phylink);

spx5_port->phylink = phylink;
phylink_set_pcs(phylink, &spx5_port->phylink_pcs);

return 0;
}
Expand Down
10 changes: 10 additions & 0 deletions drivers/net/ethernet/microchip/sparx5/sparx5_phylink.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ static bool port_conf_has_changed(struct sparx5_port_config *a, struct sparx5_po
return false;
}

static struct phylink_pcs *
sparx5_phylink_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
struct sparx5_port *port = netdev_priv(to_net_dev(config->dev));

return &port->phylink_pcs;
}

static void sparx5_phylink_mac_config(struct phylink_config *config,
unsigned int mode,
const struct phylink_link_state *state)
Expand Down Expand Up @@ -130,6 +139,7 @@ const struct phylink_pcs_ops sparx5_phylink_pcs_ops = {

const struct phylink_mac_ops sparx5_phylink_mac_ops = {
.validate = phylink_generic_validate,
.mac_select_pcs = sparx5_phylink_mac_select_pcs,
.mac_config = sparx5_phylink_mac_config,
.mac_link_down = sparx5_phylink_mac_link_down,
.mac_link_up = sparx5_phylink_mac_link_up,
Expand Down

0 comments on commit 9c8c440

Please sign in to comment.