Commit 2141297d authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: fman: convert to .mac_get_caps() 



Convert fman to use the .mac_get_caps() method rather than the
.validate() method.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarSean Anderson <sean.anderson@seco.com>
Link: https://lore.kernel.org/r/E1qsPkA-009wid-Kv@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent b6f97747

drivers/net/ethernet/freescale/fman/fman_memac.c

+5 −6
Original line number Diff line number Diff line
@@ -618,18 +618,17 @@ static int memac_accept_rx_pause_frames(struct fman_mac *memac, bool en) 
	return 0;

}



static void memac_validate(struct phylink_config *config,

			   unsigned long *supported,

			   struct phylink_link_state *state)

static unsigned long memac_get_caps(struct phylink_config *config,

				    phy_interface_t interface)

{

	struct fman_mac *memac = fman_config_to_mac(config)->fman_mac;

	unsigned long caps = config->mac_capabilities;



	if (phy_interface_mode_is_rgmii(state->interface) &&

	if (phy_interface_mode_is_rgmii(interface) &&

	    memac->rgmii_no_half_duplex)

		caps &= ~(MAC_10HD | MAC_100HD);



	phylink_validate_mask_caps(supported, state, caps);

	return caps;

}



/**
@@ -776,7 +775,7 @@ static void memac_link_down(struct phylink_config *config, unsigned int mode, 
}



static const struct phylink_mac_ops memac_mac_ops = {

	.validate = memac_validate,

	.mac_get_caps = memac_get_caps,

	.mac_select_pcs = memac_select_pcs,

	.mac_prepare = memac_prepare,

	.mac_config = memac_mac_config,