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

net: ag71xx: remove interface checks in ag71xx_mac_validate() 



As phylink checks the interface mode against the supported_interfaces
bitmap, we no longer need to validate the interface mode, nor handle
PHY_INTERFACE_MODE_NA in the validation function. Remove these to
simplify the implementation.

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

drivers/net/ethernet/atheros/ag71xx.c

+1 −40
Original line number Diff line number Diff line
@@ -1028,42 +1028,8 @@ static void ag71xx_mac_validate(struct phylink_config *config, 
			    unsigned long *supported,

			    struct phylink_link_state *state)

{

	struct ag71xx *ag = netdev_priv(to_net_dev(config->dev));

	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };



	switch (state->interface) {

	case PHY_INTERFACE_MODE_NA:

		break;

	case PHY_INTERFACE_MODE_MII:

		if ((ag71xx_is(ag, AR9330) && ag->mac_idx == 0) ||

		    ag71xx_is(ag, AR9340) ||

		    ag71xx_is(ag, QCA9530) ||

		    (ag71xx_is(ag, QCA9550) && ag->mac_idx == 1))

			break;

		goto unsupported;

	case PHY_INTERFACE_MODE_GMII:

		if ((ag71xx_is(ag, AR9330) && ag->mac_idx == 1) ||

		    (ag71xx_is(ag, AR9340) && ag->mac_idx == 1) ||

		    (ag71xx_is(ag, QCA9530) && ag->mac_idx == 1))

			break;

		goto unsupported;

	case PHY_INTERFACE_MODE_SGMII:

		if (ag71xx_is(ag, QCA9550) && ag->mac_idx == 0)

			break;

		goto unsupported;

	case PHY_INTERFACE_MODE_RMII:

		if (ag71xx_is(ag, AR9340) && ag->mac_idx == 0)

			break;

		goto unsupported;

	case PHY_INTERFACE_MODE_RGMII:

		if ((ag71xx_is(ag, AR9340) && ag->mac_idx == 0) ||

		    (ag71xx_is(ag, QCA9550) && ag->mac_idx == 1))

			break;

		goto unsupported;

	default:

		goto unsupported;

	}



	phylink_set(mask, MII);



	phylink_set(mask, Pause);
@@ -1074,8 +1040,7 @@ static void ag71xx_mac_validate(struct phylink_config *config, 
	phylink_set(mask, 100baseT_Half);

	phylink_set(mask, 100baseT_Full);



	if (state->interface == PHY_INTERFACE_MODE_NA ||

	    state->interface == PHY_INTERFACE_MODE_SGMII ||

	if (state->interface == PHY_INTERFACE_MODE_SGMII ||

	    state->interface == PHY_INTERFACE_MODE_RGMII ||

	    state->interface == PHY_INTERFACE_MODE_GMII) {

		phylink_set(mask, 1000baseT_Full);
@@ -1084,10 +1049,6 @@ static void ag71xx_mac_validate(struct phylink_config *config, 


	linkmode_and(supported, supported, mask);

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



	return;

unsupported:

	linkmode_zero(supported);

}



static void ag71xx_mac_pcs_get_state(struct phylink_config *config,