Commit 0ac4a71f authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller

net: mvneta: use .mac_select_pcs() interface

Convert mvneta 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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 72bb9531
...@@ -4012,6 +4012,15 @@ static const struct phylink_pcs_ops mvneta_phylink_pcs_ops = { ...@@ -4012,6 +4012,15 @@ static const struct phylink_pcs_ops mvneta_phylink_pcs_ops = {
.pcs_an_restart = mvneta_pcs_an_restart, .pcs_an_restart = mvneta_pcs_an_restart,
}; };
static struct phylink_pcs *mvneta_mac_select_pcs(struct phylink_config *config,
phy_interface_t interface)
{
struct net_device *ndev = to_net_dev(config->dev);
struct mvneta_port *pp = netdev_priv(ndev);
return &pp->phylink_pcs;
}
static int mvneta_mac_prepare(struct phylink_config *config, unsigned int mode, static int mvneta_mac_prepare(struct phylink_config *config, unsigned int mode,
phy_interface_t interface) phy_interface_t interface)
{ {
...@@ -4219,6 +4228,7 @@ static void mvneta_mac_link_up(struct phylink_config *config, ...@@ -4219,6 +4228,7 @@ static void mvneta_mac_link_up(struct phylink_config *config,
static const struct phylink_mac_ops mvneta_phylink_ops = { static const struct phylink_mac_ops mvneta_phylink_ops = {
.validate = phylink_generic_validate, .validate = phylink_generic_validate,
.mac_select_pcs = mvneta_mac_select_pcs,
.mac_prepare = mvneta_mac_prepare, .mac_prepare = mvneta_mac_prepare,
.mac_config = mvneta_mac_config, .mac_config = mvneta_mac_config,
.mac_finish = mvneta_mac_finish, .mac_finish = mvneta_mac_finish,
...@@ -5462,8 +5472,6 @@ static int mvneta_probe(struct platform_device *pdev) ...@@ -5462,8 +5472,6 @@ static int mvneta_probe(struct platform_device *pdev)
pp->phylink = phylink; pp->phylink = phylink;
phylink_set_pcs(phylink, &pp->phylink_pcs);
/* Alloc per-cpu port structure */ /* Alloc per-cpu port structure */
pp->ports = alloc_percpu(struct mvneta_pcpu_port); pp->ports = alloc_percpu(struct mvneta_pcpu_port);
if (!pp->ports) { if (!pp->ports) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment