---

yaml --- r: 106689 b: refs/heads/master c: 29e031d h: refs/heads/master i: 106687: c3af47f v: v3
git-mirror · Jul 23, 2008 · ff77d29 · ff77d29
1 parent 4f65c98
commit ff77d29
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89f9257c06cb635ef140bd1acf21fb067ed4ed34
+refs/heads/master: 29e031d5b09ae60d0ecdb6a1d869d591d63e893a
diff --git a/trunk/drivers/media/dvb/frontends/drx397xD.c b/trunk/drivers/media/dvb/frontends/drx397xD.c
@@ -26,6 +26,7 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/firmware.h>
+#include <asm/div64.h>
 
 #include "dvb_frontend.h"
 #include "drx397xD.h"
@@ -1024,17 +1025,15 @@ static int drx_tune(struct drx397xD_state *s,
 	rc = WR16(s, 0x0820050, rc);
 
 	{
-		long dummy;
-
 		/* Configure bandwidth specific factor */
-		ebx = div_ll_X_l_rem(((u64) (s->f_osc) << 21) + (ebx >> 1),
-				     ebx, &dummy) - 0x800000;
+		ebx = div64_64(((u64) (s->f_osc) << 21) + (ebx >> 1),
+				     (u64)ebx) - 0x800000;
 		EXIT_RC(WR16(s, 0x0c50010, ebx & 0xffff));
 		EXIT_RC(WR16(s, 0x0c50011, ebx >> 16));
 
 		/* drx397xD oscillator calibration */
-		ebx = div_ll_X_l_rem(((u64) (s->config.f_if + df_tuner) << 28) +
-				     (s->f_osc >> 1), s->f_osc, &dummy);
+		ebx = div64_64(((u64) (s->config.f_if + df_tuner) << 28) +
+				     (s->f_osc >> 1), (u64)s->f_osc);
 	}
 	ebx &= 0xfffffff;
 	if (fep->inversion == INVERSION_ON)