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

Commit d852a6af authored by Akinobu Mita's avatar Akinobu Mita Committed by Arnd Bergmann
Browse files

bitops: remove duplicated extern declarations 



If CONFIG_GENERIC_FIND_NEXT_BIT is enabled, find_next_bit() and
find_next_zero_bit() are doubly declared in asm-generic/bitops/find.h
and linux/bitops.h.

asm/bitops.h includes asm-generic/bitops/find.h if and only if the
architecture enables CONFIG_GENERIC_FIND_NEXT_BIT. And asm/bitops.h
is included by linux/bitops.h

So we can just remove the extern declarations of find_next_bit() and
find_next_zero_bit() in linux/bitops.h.

Also we can remove unneeded #ifndef CONFIG_GENERIC_FIND_NEXT_BIT in
asm-generic/bitops/find.h.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 708ff2a0

include/asm-generic/bitops/find.h

+12 −2
Original line number Diff line number Diff line 
#ifndef _ASM_GENERIC_BITOPS_FIND_H_

#define _ASM_GENERIC_BITOPS_FIND_H_



#ifndef CONFIG_GENERIC_FIND_NEXT_BIT

/**

 * find_next_bit - find the next set bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 */

extern unsigned long find_next_bit(const unsigned long *addr, unsigned long

		size, unsigned long offset);



/**

 * find_next_zero_bit - find the next cleared bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 */

extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned

		long size, unsigned long offset);

#endif



#ifdef CONFIG_GENERIC_FIND_FIRST_BIT

include/linux/bitops.h

+0 −23
Original line number Diff line number Diff line
@@ -149,28 +149,5 @@ extern unsigned long find_last_bit(const unsigned long *addr, 
				   unsigned long size);

#endif /* CONFIG_GENERIC_FIND_LAST_BIT */



#ifdef CONFIG_GENERIC_FIND_NEXT_BIT



/**

 * find_next_bit - find the next set bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 */

extern unsigned long find_next_bit(const unsigned long *addr,

				   unsigned long size, unsigned long offset);



/**

 * find_next_zero_bit - find the next cleared bit in a memory region

 * @addr: The address to base the search on

 * @offset: The bitnumber to start searching at

 * @size: The bitmap size in bits

 */



extern unsigned long find_next_zero_bit(const unsigned long *addr,

					unsigned long size,

					unsigned long offset);



#endif /* CONFIG_GENERIC_FIND_NEXT_BIT */

#endif /* __KERNEL__ */

#endif