Revert "net: ethernet: cavium: use div64_u64() instead of do_div()"
authorJakub Kicinski <kuba@kernel.org>
Fri, 11 Feb 2022 02:05:44 +0000 (18:05 -0800)
committerJakub Kicinski <kuba@kernel.org>
Sat, 12 Feb 2022 00:54:47 +0000 (16:54 -0800)
This reverts commit 038fcdaf0470de89619bc4cc199e329391e6566c.

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

Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/all/056a7276-c6f0-cd7e-9e46-1d8507a0b6b1@wanadoo.fr/
Fixes: 038fcdaf0470 ("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: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/cavium/liquidio/lio_main.c

index 8e07192..ba28aa4 100644 (file)
@@ -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 */