[PATCH 1/2] lib/bitmap.c: Change prototype of bitmap_copy_le

From: Rasmus Villemoes
Date: Tue Dec 30 2014 - 21:13:58 EST

Make the prototype of bitmap_copy_le the same as bitmap_copy's. All
other bitmap_* functions take unsigned long* parameters; there's no
reason this should be special.

The only current user is the static inline uwb_mas_bm_copy_le, which
already does the void* laundering, so the end users can pass their u8
or __le32 buffers without a cast.

Furthermore, this allows us to simply let bitmap_copy_le be an alias
for bitmap_copy on little-endian; see next patch.

Signed-off-by: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
include/linux/bitmap.h | 2 +-
lib/bitmap.c | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 202e4034fe26..bd1748919872 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -170,7 +170,7 @@ extern void bitmap_fold(unsigned long *dst, const unsigned long *orig,
extern int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order);
extern void bitmap_release_region(unsigned long *bitmap, unsigned 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(unsigned long *dst, const unsigned long *src, unsigned int nbits);
extern int bitmap_ord_to_pos(const unsigned long *bitmap, int n, int bits);
extern int bitmap_print_to_pagebuf(bool list, char *buf,
const unsigned long *maskp, int nmaskbits);
diff --git a/lib/bitmap.c b/lib/bitmap.c
index 324ea9eab8c1..5ded9180528b 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1207,16 +1207,15 @@ EXPORT_SYMBOL(bitmap_allocate_region);
* Require nbits % BITS_PER_LONG == 0.
-void bitmap_copy_le(void *dst, const unsigned long *src, int nbits)
+void bitmap_copy_le(unsigned long *dst, const unsigned long *src, unsigned int nbits)
- unsigned long *d = dst;
- int i;
+ unsigned int i;

for (i = 0; i < nbits/BITS_PER_LONG; i++) {
if (BITS_PER_LONG == 64)
- d[i] = cpu_to_le64(src[i]);
+ dst[i] = cpu_to_le64(src[i]);
- d[i] = cpu_to_le32(src[i]);
+ dst[i] = cpu_to_le32(src[i]);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/