Commit f126ec9d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Revert "net: ethernet: cavium: use div64_u64() instead of do_div()" 



This reverts commit 038fcdaf.

Christophe points out div64_u64() and do_div() have different
calling conventions. One updates the param, the other returns
the result.

Reported-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/all/056a7276-c6f0-cd7e-9e46-1d8507a0b6b1@wanadoo.fr/
Fixes: 038fcdaf ("net: ethernet: cavium: use div64_u64() instead of do_div()")
Link: https://lore.kernel.org/r/20220211020544.3262694-1-kuba@kernel.org


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

drivers/net/ethernet/cavium/liquidio/lio_main.c

+2 −2
Original line number Diff line number Diff line
@@ -1539,7 +1539,7 @@ static int liquidio_ptp_adjfreq(struct ptp_clock_info *ptp, s32 ppb) 
	 * compute the delta in terms of coprocessor clocks.

	 */

	delta = (u64)ppb << 32;

	div64_u64(delta, oct->coproc_clock_rate);

	do_div(delta, oct->coproc_clock_rate);



	spin_lock_irqsave(&lio->ptp_lock, flags);

	comp = lio_pci_readq(oct, CN6XXX_MIO_PTP_CLOCK_COMP);
@@ -1672,7 +1672,7 @@ static void liquidio_ptp_init(struct octeon_device *oct) 
	u64 clock_comp, cfg;



	clock_comp = (u64)NSEC_PER_SEC << 32;

	div64_u64(clock_comp, oct->coproc_clock_rate);

	do_div(clock_comp, oct->coproc_clock_rate);

	lio_pci_writeq(oct, clock_comp, CN6XXX_MIO_PTP_CLOCK_COMP);



	/* Enable */