Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: android: ashmem: clean up range inline functions

Clean up the code in inline functions that deal with page and
range addresses. Use bool instead of int for boolean return
types and remove superfluous brackets.

Signed-off-by: Guillaume Tucker <guillaume.tucker@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Guillaume Tucker and committed by
Greg Kroah-Hartman
8d60b476 40270ca0

+14 -14
+14 -14
drivers/staging/android/ashmem.c
··· 110 110 return range->purged == ASHMEM_NOT_PURGED; 111 111 } 112 112 113 - static inline int page_range_subsumes_range(struct ashmem_range *range, 114 - size_t start, size_t end) 113 + static inline bool page_range_subsumes_range(struct ashmem_range *range, 114 + size_t start, size_t end) 115 115 { 116 - return (((range)->pgstart >= (start)) && ((range)->pgend <= (end))); 116 + return (range->pgstart >= start) && (range->pgend <= end); 117 117 } 118 118 119 - static inline int page_range_subsumed_by_range(struct ashmem_range *range, 120 - size_t start, size_t end) 119 + static inline bool page_range_subsumed_by_range(struct ashmem_range *range, 120 + size_t start, size_t end) 121 121 { 122 - return (((range)->pgstart <= (start)) && ((range)->pgend >= (end))); 122 + return (range->pgstart <= start) && (range->pgend >= end); 123 123 } 124 124 125 - static inline int page_in_range(struct ashmem_range *range, size_t page) 125 + static inline bool page_in_range(struct ashmem_range *range, size_t page) 126 126 { 127 - return (((range)->pgstart <= (page)) && ((range)->pgend >= (page))); 127 + return (range->pgstart <= page) && (range->pgend >= page); 128 128 } 129 129 130 - static inline int page_range_in_range(struct ashmem_range *range, 131 - size_t start, size_t end) 130 + static inline bool page_range_in_range(struct ashmem_range *range, 131 + size_t start, size_t end) 132 132 { 133 - return (page_in_range(range, start) || page_in_range(range, end) || 134 - page_range_subsumes_range(range, start, end)); 133 + return page_in_range(range, start) || page_in_range(range, end) || 134 + page_range_subsumes_range(range, start, end); 135 135 } 136 136 137 - static inline int range_before_page(struct ashmem_range *range, size_t page) 137 + static inline bool range_before_page(struct ashmem_range *range, size_t page) 138 138 { 139 - return ((range)->pgend < (page)); 139 + return range->pgend < page; 140 140 } 141 141 142 142 #define PROT_MASK (PROT_EXEC | PROT_READ | PROT_WRITE)