Merge tag 'rtc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[deliverable/linux.git] / include / linux / bitmap.h

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index 27bfc0b631a98373c3af7d3f8878aa75006303ba..598bc999f4c2860969771b77d67872348f1f87f1 100644 (file)
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -266,13 +266,12 @@ static inline int bitmap_equal(const unsigned long *src1,
                        const unsigned long *src2, unsigned int nbits)
 {
        if (small_const_nbits(nbits))
-               return ! ((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
+               return !((*src1 ^ *src2) & BITMAP_LAST_WORD_MASK(nbits));
 #ifdef CONFIG_S390
-       else if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)
+       if (__builtin_constant_p(nbits) && (nbits % BITS_PER_LONG) == 0)
                return !memcmp(src1, src2, nbits / 8);
 #endif
-       else
-               return __bitmap_equal(src1, src2, nbits);
+       return __bitmap_equal(src1, src2, nbits);
 }
 
 static inline int bitmap_intersects(const unsigned long *src1,