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

net: stmmac: rename stmmac_init_ptp() 



Changes to the stmmac driver to fix various issues with PTP have made
stmmac_init_ptp() less about initialising the entire PTP block, and
now primarily deals with the packet timestamping support. The exception
to this is ptp_clk_freq_config(), which is an odditiy. It remains
as stmmac_init_ptp() is used both at .ndo_open() time and in the
resume paths.

However, restructuring this code to make it more easily readable makes
the continued use of "init_ptp" confusing.

In preparation to cleaning up the (re-)initialisation of timestamping,
rename the existing stmmac_init_ptp() to stmmac_init_timestamping()
which better reflects its functionality.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 4fbd180a

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+3 −3
Original line number Diff line number Diff line
@@ -773,13 +773,13 @@ static int stmmac_init_tstamp_counter(struct stmmac_priv *priv, 
}



/**

 * stmmac_init_ptp - init PTP

 * stmmac_init_timestamping - initialise timestamping

 * @priv: driver private structure

 * Description: this is to verify if the HW supports the PTPv1 or PTPv2.

 * This is done by looking at the HW cap. register.

 * This function also registers the ptp driver.

 */

static int stmmac_init_ptp(struct stmmac_priv *priv)

static int stmmac_init_timestamping(struct stmmac_priv *priv)

{

	bool xmac = priv->plat->has_gmac4 || priv->plat->has_xgmac;

	int ret;
@@ -3502,7 +3502,7 @@ static int stmmac_hw_setup(struct net_device *dev, bool ptp_register) 
				    ERR_PTR(ret));

	}



	if (stmmac_init_ptp(priv) == 0 && ptp_register)

	if (stmmac_init_timestamping(priv) == 0 && ptp_register)

		stmmac_ptp_register(priv);



	if (priv->use_riwt) {