diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2016-08-03 16:45:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:50:07 -0400 |
commit | 4b9d314ce9168b37a2824e6d7820aa6e66f52642 (patch) | |
tree | 641b489bf445a6fac72f37430fe6cc3c603108ce /include/linux/bitmap.h | |
parent | 97f2645f358b411ba2afb22e5966753f0ad92916 (diff) |
include/linux/bitmap.h: cleanup
Remove two unneeded `else's.
Cc: David Hildenbrand <dahi@linux.vnet.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/bitmap.h')
-rw-r--r-- | include/linux/bitmap.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h index 27bfc0b631a9..598bc999f4c2 100644 --- a/include/linux/bitmap.h +++ b/include/linux/bitmap.h | |||
@@ -266,13 +266,12 @@ static inline int bitmap_equal(const unsigned long *src1, | |||
266 | const unsigned long *src2, unsigned int nbits) | 266 | const unsigned long *src2, unsigned int nbits) |
267 | { | 267 | { |
268 | if (small_const_nbits(nbits)) | 268 | if (small_const_nbits(nbits)) |
269 | return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); | 269 | return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits)); |
270 | #ifdef CONFIG_S390 | 270 | #ifdef CONFIG_S390 |
271 | else if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0) | 271 | if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0) |
272 | return !memcmp(src1, src2, nbits / 8); | 272 | return !memcmp(src1, src2, nbits / 8); |
273 | #endif | 273 | #endif |
274 | else | 274 | return __bitmap_equal(src1, src2, nbits); |
275 | return __bitmap_equal(src1, src2, nbits); | ||
276 | } | 275 | } |
277 | 276 | ||
278 | static inline int bitmap_intersects(const unsigned long *src1, | 277 | static inline int bitmap_intersects(const unsigned long *src1, |