Commit 9279d328 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

lib: bitmap: change parameter of bitmap_*_region to unsigned



Changing the pos parameter of __reg_op to unsigned allows the compiler
to generate slightly smaller and simpler code.  Also update its callers
bitmap_*_region to receive and pass unsigned int.  The return types of
bitmap_find_free_region and bitmap_allocate_region are still int to
allow a negative error code to be returned.  An int is certainly capable
of representing any realistic return value.
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a8551748
...@@ -140,9 +140,9 @@ extern void bitmap_onto(unsigned long *dst, const unsigned long *orig, ...@@ -140,9 +140,9 @@ extern void bitmap_onto(unsigned long *dst, const unsigned long *orig,
const unsigned long *relmap, int bits); const unsigned long *relmap, int bits);
extern void bitmap_fold(unsigned long *dst, const unsigned long *orig, extern void bitmap_fold(unsigned long *dst, const unsigned long *orig,
int sz, int bits); int sz, int bits);
extern int bitmap_find_free_region(unsigned long *bitmap, int bits, int order); extern int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order);
extern void bitmap_release_region(unsigned long *bitmap, int pos, int order); extern void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order);
extern int bitmap_allocate_region(unsigned long *bitmap, int pos, int order); extern int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order);
extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits); extern void bitmap_copy_le(void *dst, const unsigned long *src, int nbits);
extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits); extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits);
......
...@@ -1042,7 +1042,7 @@ enum { ...@@ -1042,7 +1042,7 @@ enum {
REG_OP_RELEASE, /* clear all bits in region */ REG_OP_RELEASE, /* clear all bits in region */
}; };
static int __reg_op(unsigned long *bitmap, int pos, int order, int reg_op) static int __reg_op(unsigned long *bitmap, unsigned int pos, int order, int reg_op)
{ {
int nbits_reg; /* number of bits in region */ int nbits_reg; /* number of bits in region */
int index; /* index first long of region in bitmap */ int index; /* index first long of region in bitmap */
...@@ -1108,11 +1108,11 @@ done: ...@@ -1108,11 +1108,11 @@ done:
* Return the bit offset in bitmap of the allocated region, * Return the bit offset in bitmap of the allocated region,
* or -errno on failure. * or -errno on failure.
*/ */
int bitmap_find_free_region(unsigned long *bitmap, int bits, int order) int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order)
{ {
int pos, end; /* scans bitmap by regions of size order */ unsigned int pos, end; /* scans bitmap by regions of size order */
for (pos = 0 ; (end = pos + (1 << order)) <= bits; pos = end) { for (pos = 0 ; (end = pos + (1U << order)) <= bits; pos = end) {
if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE)) if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
continue; continue;
__reg_op(bitmap, pos, order, REG_OP_ALLOC); __reg_op(bitmap, pos, order, REG_OP_ALLOC);
...@@ -1133,7 +1133,7 @@ EXPORT_SYMBOL(bitmap_find_free_region); ...@@ -1133,7 +1133,7 @@ EXPORT_SYMBOL(bitmap_find_free_region);
* *
* No return value. * No return value.
*/ */
void bitmap_release_region(unsigned long *bitmap, int pos, int order) void bitmap_release_region(unsigned long *bitmap, unsigned int pos, int order)
{ {
__reg_op(bitmap, pos, order, REG_OP_RELEASE); __reg_op(bitmap, pos, order, REG_OP_RELEASE);
} }
...@@ -1150,7 +1150,7 @@ EXPORT_SYMBOL(bitmap_release_region); ...@@ -1150,7 +1150,7 @@ EXPORT_SYMBOL(bitmap_release_region);
* Return 0 on success, or %-EBUSY if specified region wasn't * Return 0 on success, or %-EBUSY if specified region wasn't
* free (not all bits were zero). * free (not all bits were zero).
*/ */
int bitmap_allocate_region(unsigned long *bitmap, int pos, int order) int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order)
{ {
if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE)) if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
return -EBUSY; return -EBUSY;
......
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