ptp_qoriq: use div_u64/div_u64_rem for 64-bit division
authorYangbo Lu <yangbo.lu@nxp.com>
Mon, 6 Aug 2018 04:39:11 +0000 (12:39 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 6 Aug 2018 17:43:35 +0000 (10:43 -0700)
This is a fix-up patch for below build issue with multi_v7_defconfig.

drivers/ptp/ptp_qoriq.o: In function `qoriq_ptp_probe':
ptp_qoriq.c:(.text+0xd0c): undefined reference to `__aeabi_uldivmod'

Fixes: 91305f281262 ("ptp_qoriq: support automatic configuration for ptp timer")
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/ptp/ptp_qoriq.c

index 095c18532dc7a03171bcf22b4428d632aaaf684a..fdd49c26bbcc5b11b83f35f2dabb61eada02d904 100644 (file)
@@ -373,6 +373,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
        u64 freq_comp;
        u64 max_adj;
        u32 nominal_freq;
+       u32 remainder = 0;
        u32 clk_src = 0;
 
        qoriq_ptp->cksel = DEFAULT_CKSEL;
@@ -400,7 +401,8 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
         * freq_ratio = reference_clock_freq / nominal_freq
         */
        freq_comp = ((u64)1 << 32) * nominal_freq;
-       if (do_div(freq_comp, clk_src))
+       freq_comp = div_u64_rem(freq_comp, clk_src, &remainder);
+       if (remainder)
                freq_comp++;
 
        qoriq_ptp->tmr_add = freq_comp;
@@ -411,7 +413,7 @@ static int qoriq_ptp_auto_config(struct qoriq_ptp *qoriq_ptp,
         * freq_ratio = reference_clock_freq / nominal_freq
         */
        max_adj = 1000000000ULL * (clk_src - nominal_freq);
-       max_adj = max_adj / nominal_freq - 1;
+       max_adj = div_u64(max_adj, nominal_freq) - 1;
        qoriq_ptp->caps.max_adj = max_adj;
 
        return 0;