[PATCH 4/6] bitmap: replace _reg_op(REG_OP_ISFREE) with bitmap_empty_from()

Yury Norov posted 6 patches 3 years, 5 months ago
[PATCH 4/6] bitmap: replace _reg_op(REG_OP_ISFREE) with bitmap_empty_from()
Posted by Yury Norov 3 years, 5 months ago
_reg_op(REG_OP_ISFREE) duplicates bitmap_empty_from(). Drop it.

Signed-off-by: Yury Norov <yury.norov@gmail.com>
---
 lib/bitmap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bitmap.c b/lib/bitmap.c
index 813962bdbd93..389446b6f248 100644
--- a/lib/bitmap.c
+++ b/lib/bitmap.c
@@ -1315,7 +1315,7 @@ int bitmap_find_free_region(unsigned long *bitmap, unsigned int bits, int order)
 	unsigned int pos, end;		/* scans bitmap by regions of size order */
 
 	for (pos = 0 ; (end = pos + (1U << order)) <= bits; pos = end) {
-		if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
+		if (!bitmap_empty_from(bitmap, pos, pos + BIT(order)))
 			continue;
 		bitmap_set(bitmap, pos, pos + BIT(order));
 		return pos;
@@ -1354,7 +1354,7 @@ EXPORT_SYMBOL(bitmap_release_region);
  */
 int bitmap_allocate_region(unsigned long *bitmap, unsigned int pos, int order)
 {
-	if (!__reg_op(bitmap, pos, order, REG_OP_ISFREE))
+	if (!bitmap_empty_from(bitmap, pos, pos + BIT(order)))
 		return -EBUSY;
 	bitmap_set(bitmap, pos, pos + BIT(order));
 	return 0;
-- 
2.34.1