Commit 7258aa50 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: ocelot_net: use phylink_generic_validate() 



ocelot_net has no special behaviour in its validation implementation, so
can be switched to phylink_generic_validate().

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6f5248b

drivers/net/ethernet/mscc/ocelot_net.c

+3 −26
Original line number Diff line number Diff line
@@ -1498,31 +1498,6 @@ struct notifier_block ocelot_switchdev_blocking_nb __read_mostly = { 
	.notifier_call = ocelot_switchdev_blocking_event,

};



static void vsc7514_phylink_validate(struct phylink_config *config,

				     unsigned long *supported,

				     struct phylink_link_state *state)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = {};



	phylink_set_port_modes(mask);



	phylink_set(mask, Pause);

	phylink_set(mask, Autoneg);

	phylink_set(mask, Asym_Pause);

	phylink_set(mask, 10baseT_Half);

	phylink_set(mask, 10baseT_Full);

	phylink_set(mask, 100baseT_Half);

	phylink_set(mask, 100baseT_Full);

	phylink_set(mask, 1000baseT_Half);

	phylink_set(mask, 1000baseT_Full);

	phylink_set(mask, 1000baseX_Full);

	phylink_set(mask, 2500baseT_Full);

	phylink_set(mask, 2500baseX_Full);



	linkmode_and(supported, supported, mask);

	linkmode_and(state->advertising, state->advertising, mask);

}



static void vsc7514_phylink_mac_config(struct phylink_config *config,

				       unsigned int link_an_mode,

				       const struct phylink_link_state *state)
@@ -1581,7 +1556,7 @@ static void vsc7514_phylink_mac_link_up(struct phylink_config *config, 
}



static const struct phylink_mac_ops ocelot_phylink_ops = {

	.validate		= vsc7514_phylink_validate,

	.validate		= phylink_generic_validate,

	.mac_config		= vsc7514_phylink_mac_config,

	.mac_link_down		= vsc7514_phylink_mac_link_down,

	.mac_link_up		= vsc7514_phylink_mac_link_up,
@@ -1645,6 +1620,8 @@ static int ocelot_port_phylink_create(struct ocelot *ocelot, int port, 


	priv->phylink_config.dev = &priv->dev->dev;

	priv->phylink_config.type = PHYLINK_NETDEV;

	priv->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

		MAC_10 | MAC_100 | MAC_1000FD | MAC_2500FD;



	__set_bit(ocelot_port->phy_mode,

		  priv->phylink_config.supported_interfaces);