Commit 8142773c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] ppc64: run bitops.c through Lindent

From: Anton Blanchard <anton@samba.org>

bitops.c was a bit of a mess wrt formatting so run it through Lindent.  No
code changes.
parent 2118a037
...@@ -20,7 +20,7 @@ unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size, ...@@ -20,7 +20,7 @@ unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size,
offset &= 63UL; offset &= 63UL;
if (offset) { if (offset) {
tmp = *(p++); tmp = *(p++);
tmp |= ~0UL >> (64-offset); tmp |= ~0UL >> (64 - offset);
if (size < 64) if (size < 64)
goto found_first; goto found_first;
if (~tmp) if (~tmp)
...@@ -41,10 +41,11 @@ unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size, ...@@ -41,10 +41,11 @@ unsigned long find_next_zero_bit(unsigned long *addr, unsigned long size,
found_first: found_first:
tmp |= ~0UL << size; tmp |= ~0UL << size;
if (tmp == ~0UL) /* Are any bits zero? */ if (tmp == ~0UL) /* Are any bits zero? */
return result + size; /* Nope. */ return result + size; /* Nope. */
found_middle: found_middle:
return result + ffz(tmp); return result + ffz(tmp);
} }
EXPORT_SYMBOL(find_next_zero_bit); EXPORT_SYMBOL(find_next_zero_bit);
unsigned long find_next_bit(unsigned long *addr, unsigned long size, unsigned long find_next_bit(unsigned long *addr, unsigned long size,
...@@ -80,18 +81,19 @@ unsigned long find_next_bit(unsigned long *addr, unsigned long size, ...@@ -80,18 +81,19 @@ unsigned long find_next_bit(unsigned long *addr, unsigned long size,
found_first: found_first:
tmp &= (~0UL >> (64 - size)); tmp &= (~0UL >> (64 - size));
if (tmp == 0UL) /* Are any bits set? */ if (tmp == 0UL) /* Are any bits set? */
return result + size; /* Nope. */ return result + size; /* Nope. */
found_middle: found_middle:
return result + __ffs(tmp); return result + __ffs(tmp);
} }
EXPORT_SYMBOL(find_next_bit); EXPORT_SYMBOL(find_next_bit);
static inline unsigned int ext2_ilog2(unsigned int x) static inline unsigned int ext2_ilog2(unsigned int x)
{ {
int lz; int lz;
asm("cntlzw %0,%1" : "=r" (lz) : "r" (x)); asm("cntlzw %0,%1": "=r"(lz):"r"(x));
return 31 - lz; return 31 - lz;
} }
...@@ -107,38 +109,39 @@ static inline unsigned int ext2_ffz(unsigned int x) ...@@ -107,38 +109,39 @@ static inline unsigned int ext2_ffz(unsigned int x)
unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size, unsigned long find_next_zero_le_bit(unsigned long *addr, unsigned long size,
unsigned long offset) unsigned long offset)
{ {
unsigned int *p = ((unsigned int *) addr) + (offset >> 5); unsigned int *p = ((unsigned int *)addr) + (offset >> 5);
unsigned int result = offset & ~31; unsigned int result = offset & ~31;
unsigned int tmp; unsigned int tmp;
if (offset >= size) if (offset >= size)
return size; return size;
size -= result; size -= result;
offset &= 31; offset &= 31;
if (offset) { if (offset) {
tmp = cpu_to_le32p(p++); tmp = cpu_to_le32p(p++);
tmp |= ~0U >> (32-offset); /* bug or feature ? */ tmp |= ~0U >> (32 - offset); /* bug or feature ? */
if (size < 32) if (size < 32)
goto found_first; goto found_first;
if (tmp != ~0) if (tmp != ~0)
goto found_middle; goto found_middle;
size -= 32; size -= 32;
result += 32; result += 32;
} }
while (size >= 32) { while (size >= 32) {
if ((tmp = cpu_to_le32p(p++)) != ~0) if ((tmp = cpu_to_le32p(p++)) != ~0)
goto found_middle; goto found_middle;
result += 32; result += 32;
size -= 32; size -= 32;
} }
if (!size) if (!size)
return result; return result;
tmp = cpu_to_le32p(p); tmp = cpu_to_le32p(p);
found_first: found_first:
tmp |= ~0 << size; tmp |= ~0 << size;
if (tmp == ~0) /* Are any bits zero? */ if (tmp == ~0) /* Are any bits zero? */
return result + size; /* Nope. */ return result + size; /* Nope. */
found_middle: found_middle:
return result + ext2_ffz(tmp); return result + ext2_ffz(tmp);
} }
EXPORT_SYMBOL(find_next_zero_le_bit); EXPORT_SYMBOL(find_next_zero_le_bit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment