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

Commit c4596435 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Linus Torvalds
Browse files

bitmask: remove bitmap_scnprintf_len() 



bitmap_scnprintf_len() is not used now, so we remove it.

Otherwise we have to maintain it and make its return
value always equal to bitmap_scnprintf()'s return value.

Signed-off-by: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Paul Menage <menage@google.com>
Cc: Paul Jackson <pj@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 30e8e136

include/linux/bitmap.h

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ extern int __bitmap_weight(const unsigned long *bitmap, int bits); 


extern int bitmap_scnprintf(char *buf, unsigned int len,

			const unsigned long *src, int nbits);

extern int bitmap_scnprintf_len(unsigned int nr_bits);

extern int __bitmap_parse(const char *buf, unsigned int buflen, int is_user,

			unsigned long *dst, int nbits);

extern int bitmap_parse_user(const char __user *ubuf, unsigned int ulen,

lib/bitmap.c

+0 −11
Original line number Diff line number Diff line
@@ -315,17 +315,6 @@ int bitmap_scnprintf(char *buf, unsigned int buflen, 
}

EXPORT_SYMBOL(bitmap_scnprintf);



/**

 * bitmap_scnprintf_len - return buffer length needed to convert

 * bitmap to an ASCII hex string

 * @nr_bits: number of bits to be converted

 */

int bitmap_scnprintf_len(unsigned int nr_bits)

{

	unsigned int nr_nibbles = ALIGN(nr_bits, 4) / 4;

	return nr_nibbles + ALIGN(nr_nibbles, CHUNKSZ / 4) / (CHUNKSZ / 4) - 1;

}



/**

 * __bitmap_parse - convert an ASCII hex string into a bitmap.

 * @buf: pointer to buffer containing string.