diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2021-11-23 16:23:01 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-01-18 10:17:21 +0000 |
| commit | e5f6ec6854e34e50c90f0c67436e80158ad406af (patch) | |
| tree | 4d94160a322758f976a9d01db42c5c1aba9d87bc | |
| parent | f96a431fc73e1bff01411ef96f3ba7e9e7e99f47 (diff) | |
net: dsa: ocelot: convert to mac_select_pcs()
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/dsa/ocelot/felix.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index ffc484e817fe..ac1f8f210e87 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -814,16 +814,18 @@ static void felix_phylink_get_caps(struct dsa_switch *ds, int port, felix->info->phylink_get_caps(ocelot, port, config); } -static void felix_phylink_mac_config(struct dsa_switch *ds, int port, - unsigned int link_an_mode, - const struct phylink_link_state *state) +static struct phylink_pcs *felix_phylink_mac_select_pcs(struct dsa_switch *ds, + int port, + phy_interface_t iface) { struct ocelot *ocelot = ds->priv; struct felix *felix = ocelot_to_felix(ocelot); - struct dsa_port *dp = dsa_to_port(ds, port); + struct phylink_pcs *pcs = NULL; if (felix->pcs[port]) - phylink_set_pcs(dp->pl, &felix->pcs[port]->pcs); + pcs = &felix->pcs[port]->pcs; + + return pcs; } static void felix_phylink_mac_link_down(struct dsa_switch *ds, int port, @@ -1643,7 +1645,7 @@ const struct dsa_switch_ops felix_switch_ops = { .get_sset_count = felix_get_sset_count, .get_ts_info = felix_get_ts_info, .phylink_get_caps = felix_phylink_get_caps, - .phylink_mac_config = felix_phylink_mac_config, + .phylink_mac_select_pcs = felix_phylink_mac_select_pcs, .phylink_mac_link_down = felix_phylink_mac_link_down, .phylink_mac_link_up = felix_phylink_mac_link_up, .port_fdb_dump = felix_fdb_dump, |