2 files changed, 4 insertions, 34 deletions

diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
index be4fa5ddf36c..ea17cca9e685 100644
--- a/include/linux/bitmap.h
+++ b/include/linux/bitmap.h
@@ -283,16 +283,16 @@ static inline int bitmap_empty(const unsigned long *src, unsigned nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (*src & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_empty(src, nbits);
+
+        return find_first_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
 {
         if (small_const_nbits(nbits))
                 return ! (~(*src) & BITMAP_LAST_WORD_MASK(nbits));
-        else
-                return __bitmap_full(src, nbits);
+
+        return find_first_zero_bit(src, nbits) == nbits;
 }
 
 static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
diff --git a/lib/bitmap.c b/lib/bitmap.c
index d456f4c15a9f..64c0926f5dd8 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -42,36 +42,6 @@
  * for the best explanations of this ordering.
  */
 
-int __bitmap_empty(const unsigned long *bitmap, unsigned int bits)
-{
-        unsigned int k, lim = bits/BITS_PER_LONG;
-        for (k = 0; k < lim; ++k)
-                if (bitmap[k])
-                        return 0;
-
-        if (bits % BITS_PER_LONG)
-                if (bitmap[k] & BITMAP_LAST_WORD_MASK(bits))
-                        return 0;
-
-        return 1;
-}
-EXPORT_SYMBOL(__bitmap_empty);
-
-int __bitmap_full(const unsigned long *bitmap, unsigned int bits)
-{
-        unsigned int k, lim = bits/BITS_PER_LONG;
-        for (k = 0; k < lim; ++k)
-                if (~bitmap[k])
-                        return 0;
-
-        if (bits % BITS_PER_LONG)
-                if (~bitmap[k] & BITMAP_LAST_WORD_MASK(bits))
-                        return 0;
-
-        return 1;
-}
-EXPORT_SYMBOL(__bitmap_full);
-
 int __bitmap_equal(const unsigned long *bitmap1,
                 const unsigned long *bitmap2, unsigned int bits)
 {