summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-02-09 23:42:50 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2006-02-09 23:42:50 -0500
commit99b16f717573fb8dd0f8f7bb7a783bce25f673eb (patch)
tree704c9c19e751952a8f010587d0e1eaedad29aa50
parent254ef7f974a59fbf4834c0a19add07531a9bf4dd (diff)
downloadmediapointer-dvb-s2-99b16f717573fb8dd0f8f7bb7a783bce25f673eb.tar.gz
mediapointer-dvb-s2-99b16f717573fb8dd0f8f7bb7a783bce25f673eb.tar.bz2
at76c651: don't do generic __ilog2 on mips
From: Alexey Dobriyan <adobriyan@gmail.com> dvb/frontends/at76c651.c: redefinition of __ilog2 blah blah (akpm: I nuked __ilog2 and used the standard long_log2() instead) We've already removed this module from the kernel, but it is still in the v4l-dvb tree, best to keep it up-to-date. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
-rw-r--r--linux/drivers/media/dvb/frontends/at76c651.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/linux/drivers/media/dvb/frontends/at76c651.c b/linux/drivers/media/dvb/frontends/at76c651.c
index 28fac791d..ddcb99cc5 100644
--- a/linux/drivers/media/dvb/frontends/at76c651.c
+++ b/linux/drivers/media/dvb/frontends/at76c651.c
@@ -61,21 +61,6 @@ static int debug;
} while (0)
-#if ! defined(__powerpc__)
-static __inline__ int __ilog2(unsigned long x)
-{
- int i;
-
- if (x == 0)
- return -1;
-
- for (i = 0; x != 0; i++)
- x >>= 1;
-
- return i - 1;
-}
-#endif
-
static int at76c651_writereg(struct at76c651_state* state, u8 reg, u8 data)
{
int ret;
@@ -183,7 +168,7 @@ static int at76c651_set_symbol_rate(struct at76c651_state* state, u32 symbol_rat
* mantissa = (symbol_rate / FREF) * (1 << (30 - exponent))
*/
- exponent = __ilog2((symbol_rate << 4) / 903125);
+ exponent = long_log2((symbol_rate << 4) / 903125);
mantissa = ((symbol_rate / 3125) * (1 << (24 - exponent))) / 289;
at76c651_writereg(state, 0x00, mantissa >> 13);