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.tuc...@gmail.com>
---
 drivers/staging/android/ashmem.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c
index facc8a24..7cbad0d 100644
--- a/drivers/staging/android/ashmem.c
+++ b/drivers/staging/android/ashmem.c
@@ -110,33 +110,33 @@ static inline bool range_on_lru(struct ashmem_range 
*range)
        return range->purged == ASHMEM_NOT_PURGED;
 }
 
-static inline int page_range_subsumes_range(struct ashmem_range *range,
-                                           size_t start, size_t end)
+static inline bool page_range_subsumes_range(struct ashmem_range *range,
+                                            size_t start, size_t end)
 {
-       return (((range)->pgstart >= (start)) && ((range)->pgend <= (end)));
+       return (range->pgstart >= start) && (range->pgend <= end);
 }
 
-static inline int page_range_subsumed_by_range(struct ashmem_range *range,
-                                              size_t start, size_t end)
+static inline bool page_range_subsumed_by_range(struct ashmem_range *range,
+                                               size_t start, size_t end)
 {
-       return (((range)->pgstart <= (start)) && ((range)->pgend >= (end)));
+       return (range->pgstart <= start) && (range->pgend >= end);
 }
 
-static inline int page_in_range(struct ashmem_range *range, size_t page)
+static inline bool page_in_range(struct ashmem_range *range, size_t page)
 {
-       return (((range)->pgstart <= (page)) && ((range)->pgend >= (page)));
+       return (range->pgstart <= page) && (range->pgend >= page);
 }
 
-static inline int page_range_in_range(struct ashmem_range *range,
-                                     size_t start, size_t end)
+static inline bool page_range_in_range(struct ashmem_range *range,
+                                      size_t start, size_t end)
 {
-       return (page_in_range(range, start) || page_in_range(range, end) ||
-               page_range_subsumes_range(range, start, end));
+       return page_in_range(range, start) || page_in_range(range, end) ||
+               page_range_subsumes_range(range, start, end);
 }
 
-static inline int range_before_page(struct ashmem_range *range, size_t page)
+static inline bool range_before_page(struct ashmem_range *range, size_t page)
 {
-       return ((range)->pgend < (page));
+       return range->pgend < page;
 }
 
 #define PROT_MASK              (PROT_EXEC | PROT_READ | PROT_WRITE)
-- 
2.8.1.116.g7b0d47b

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Reply via email to