Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b6c2d2e authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Linus Torvalds
Browse files

lib/bitmap.c: change prototype of bitmap_copy_le 



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: 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 db3ecdee

include/linux/bitmap.h

+1 −1
Original line number Diff line number Diff line
@@ -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 unsigned int bitmap_ord_to_pos(const unsigned long *bitmap, unsigned int ord, unsigned int nbits);

extern int bitmap_print_to_pagebuf(bool list, char *buf,

				   const unsigned long *maskp, int nmaskbits);

lib/bitmap.c

+4 −5
Original line number Diff line number Diff line
@@ -1191,16 +1191,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]);

		else

			d[i] = cpu_to_le32(src[i]);

			dst[i] = cpu_to_le32(src[i]);

	}

}

EXPORT_SYMBOL(bitmap_copy_le);