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: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

authored by Akinobu Mita and committed by Arnd Bergmann d852a6af 708ff2a0

+12 -25
+12 -2
include/asm-generic/bitops/find.h
··· 1 1 #ifndef _ASM_GENERIC_BITOPS_FIND_H_ 2 2 #define _ASM_GENERIC_BITOPS_FIND_H_ 3 3 4 - #ifndef CONFIG_GENERIC_FIND_NEXT_BIT 4 + /** 5 + * find_next_bit - find the next set bit in a memory region 6 + * @addr: The address to base the search on 7 + * @offset: The bitnumber to start searching at 8 + * @size: The bitmap size in bits 9 + */ 5 10 extern unsigned long find_next_bit(const unsigned long *addr, unsigned long 6 11 size, unsigned long offset); 7 12 13 + /** 14 + * find_next_zero_bit - find the next cleared bit in a memory region 15 + * @addr: The address to base the search on 16 + * @offset: The bitnumber to start searching at 17 + * @size: The bitmap size in bits 18 + */ 8 19 extern unsigned long find_next_zero_bit(const unsigned long *addr, unsigned 9 20 long size, unsigned long offset); 10 - #endif 11 21 12 22 #ifdef CONFIG_GENERIC_FIND_FIRST_BIT 13 23
-23
include/linux/bitops.h
··· 149 149 unsigned long size); 150 150 #endif /* CONFIG_GENERIC_FIND_LAST_BIT */ 151 151 152 - #ifdef CONFIG_GENERIC_FIND_NEXT_BIT 153 - 154 - /** 155 - * find_next_bit - find the next set bit in a memory region 156 - * @addr: The address to base the search on 157 - * @offset: The bitnumber to start searching at 158 - * @size: The bitmap size in bits 159 - */ 160 - extern unsigned long find_next_bit(const unsigned long *addr, 161 - unsigned long size, unsigned long offset); 162 - 163 - /** 164 - * find_next_zero_bit - find the next cleared bit in a memory region 165 - * @addr: The address to base the search on 166 - * @offset: The bitnumber to start searching at 167 - * @size: The bitmap size in bits 168 - */ 169 - 170 - extern unsigned long find_next_zero_bit(const unsigned long *addr, 171 - unsigned long size, 172 - unsigned long offset); 173 - 174 - #endif /* CONFIG_GENERIC_FIND_NEXT_BIT */ 175 152 #endif /* __KERNEL__ */ 176 153 #endif