[PATCH] include: mman: Use bool instead of int for the return value of arch_validate_prot
From: chengang
Date: Sat Jul 09 2016 - 12:35:24 EST
From: Chen Gang <chengang@xxxxxxxxxxxxxxxx>
For pure bool function's return value, bool is a little better more or
less than int.
And return boolean result directly. Since 'if' statement is also for
boolean checking, and return boolean result, too.
Signed-off-by: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
---
arch/powerpc/include/asm/mman.h | 8 +++-----
include/linux/mman.h | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/include/asm/mman.h b/arch/powerpc/include/asm/mman.h
index 2563c43..62e1f47 100644
--- a/arch/powerpc/include/asm/mman.h
+++ b/arch/powerpc/include/asm/mman.h
@@ -31,13 +31,11 @@ static inline pgprot_t arch_vm_get_page_prot(unsigned long vm_flags)
}
#define arch_vm_get_page_prot(vm_flags) arch_vm_get_page_prot(vm_flags)
-static inline int arch_validate_prot(unsigned long prot)
+static inline bool arch_validate_prot(unsigned long prot)
{
if (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM | PROT_SAO))
- return 0;
- if ((prot & PROT_SAO) && !cpu_has_feature(CPU_FTR_SAO))
- return 0;
- return 1;
+ return false;
+ return (prot & PROT_SAO) == 0 || cpu_has_feature(CPU_FTR_SAO);
}
#define arch_validate_prot(prot) arch_validate_prot(prot)
diff --git a/include/linux/mman.h b/include/linux/mman.h
index 33e17f6..634c4c5 100644
--- a/include/linux/mman.h
+++ b/include/linux/mman.h
@@ -49,7 +49,7 @@ static inline void vm_unacct_memory(long pages)
*
* Returns true if the prot flags are valid
*/
-static inline int arch_validate_prot(unsigned long prot)
+static inline bool arch_validate_prot(unsigned long prot)
{
return (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_SEM)) == 0;
}
--
1.9.3