mm, vmalloc: use clamp() to simplify code

Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

mm, vmalloc: use clamp() to simplify code
Signed-off-by: Zhang Yanfei <zhangyanfei@cn.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Zhang Yanfei · Linus Torvalds
1 parent f6d480059b
Showing 1 changed file with 2 additions and 10 deletions Side-by-side Diff
mm/vmalloc.c
@@ -1330,16 +1330,8 @@
 	struct vm_struct *area;
  
 	BUG_ON(in_interrupt());
-	if (flags & VM_IOREMAP) {
-		int bit = fls(size);
-
-		if (bit > IOREMAP_MAX_ORDER)
-			bit = IOREMAP_MAX_ORDER;
-		else if (bit < PAGE_SHIFT)
-			bit = PAGE_SHIFT;
-
-		align = 1ul << bit;
-	}
+	if (flags & VM_IOREMAP)
+		align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
  
 	size = PAGE_ALIGN(size);
 	if (unlikely(!size))
...	...	@@ -1330,16 +1330,8 @@
1330	1330	struct vm_struct *area;
1331	1331
1332	1332	BUG_ON(in_interrupt());
1333		- if (flags & VM_IOREMAP) {
1334		- int bit = fls(size);
1335		-
1336		- if (bit > IOREMAP_MAX_ORDER)
1337		- bit = IOREMAP_MAX_ORDER;
1338		- else if (bit < PAGE_SHIFT)
1339		- bit = PAGE_SHIFT;
1340		-
1341		- align = 1ul << bit;
1342		- }
	1333	+ if (flags & VM_IOREMAP)
	1334	+ align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
1343	1335
1344	1336	size = PAGE_ALIGN(size);
1345	1337	if (unlikely(!size))