convert a few do_div users

This converts a few users of do_div to div_[su]64 and this demonstrates nicely
how it can reduce some expressions to one-liners.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Cc: john stultz <johnstul@us.ibm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 19 deletions

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 5fd9b9469770..a4492f3d64db 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -15,7 +15,7 @@
 #include <linux/jiffies.h>
 #include <linux/hrtimer.h>
 #include <linux/capability.h>
-#include <asm/div64.h>
+#include <linux/math64.h>
 #include <asm/timex.h>
 
 /*
@@ -53,10 +53,8 @@ static void ntp_update_frequency(void)
 
         tick_length_base = second_length;
 
-        do_div(second_length, HZ);
-        tick_nsec = second_length >> TICK_LENGTH_SHIFT;
-
-        do_div(tick_length_base, NTP_INTERVAL_FREQ);
+        tick_nsec = div_u64(second_length, HZ) >> TICK_LENGTH_SHIFT;
+        tick_length_base = div_u64(tick_length_base, NTP_INTERVAL_FREQ);
 }
 
 /**
@@ -237,7 +235,7 @@ static inline void notify_cmos_timer(void) { }
 int do_adjtimex(struct timex *txc)
 {
         long mtemp, save_adjust, rem;
-        s64 freq_adj, temp64;
+        s64 freq_adj;
         int result;
 
         /* In order to modify anything, you gotta be super-user! */
@@ -342,19 +340,8 @@ int do_adjtimex(struct timex *txc)
                     freq_adj = time_offset * mtemp;
                     freq_adj = shift_right(freq_adj, time_constant * 2 +
                                            (SHIFT_PLL + 2) * 2 - SHIFT_NSEC);
-                    if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC)) {
-                        u64 utemp64;
-                        temp64 = time_offset << (SHIFT_NSEC - SHIFT_FLL);
-                        if (time_offset < 0) {
-                            utemp64 = -temp64;
-                            do_div(utemp64, mtemp);
-                            freq_adj -= utemp64;
-                        } else {
-                            utemp64 = temp64;
-                            do_div(utemp64, mtemp);
-                            freq_adj += utemp64;
-                        }
-                    }
+                    if (mtemp >= MINSEC && (time_status & STA_FLL || mtemp > MAXSEC))
+                        freq_adj += div_s64(time_offset << (SHIFT_NSEC - SHIFT_FLL), mtemp);
                     freq_adj += time_freq;
                     freq_adj = min(freq_adj, (s64)MAXFREQ_NSEC);
                     time_freq = max(freq_adj, (s64)-MAXFREQ_NSEC);