Skip to content

Commit

Permalink
[MIPS] Get rid of __ilog2
Browse files Browse the repository at this point in the history
56a6b1e was a bit too conservative and
left __ilog2 around which is only used as an internal function for other
bitops.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed May 12, 2008
1 parent fcd84f2 commit ddc0d00
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions include/asm-mips/bitops.h
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ static inline void __clear_bit_unlock(unsigned long nr, volatile unsigned long *
* Return the bit position (0..63) of the most significant 1 bit in a word
* Returns -1 if no 1 bit exists
*/
static inline int __ilog2(unsigned long x)
static inline unsigned long __fls(unsigned long x)
{
int lz;

Expand Down Expand Up @@ -593,11 +593,6 @@ static inline int __ilog2(unsigned long x)
return 63 - lz;
}

static inline unsigned long __fls(unsigned long x)
{
return __ilog2(x);
}

/*
* __ffs - find first bit in word.
* @word: The word to search
Expand All @@ -607,7 +602,7 @@ static inline unsigned long __fls(unsigned long x)
*/
static inline unsigned long __ffs(unsigned long word)
{
return __ilog2(word & -word);
return __fls(word & -word);
}

/*
Expand Down

0 comments on commit ddc0d00

Please sign in to comment.