Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e2a83f32 authored by Bhumika Goyal's avatar Bhumika Goyal Committed by Greg Kroah-Hartman
Browse files

Staging: android: ashmem.c: Redefine macros as static inline functions 



Convert macros page_in_range and range_before_page into static inline
functions as static inline functions are preferred over macros. The
change can be done as the arguments at all call sites have the same type.
Also, both the macros have same type of arguments and return
values.
Done using coccinelle:

@r@
identifier f;
expression e;
@@
#define f(...) e

@r1@
identifier r.f;
identifier range,page;
expression r.e;
@@
- #define f(range,page) e
+ static inline int f(struct ashmem_range *range, size_t page)
+ {
+	return e;
+ }

Signed-off-by: default avatarBhumika Goyal <bhumirks@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0103fe20

drivers/staging/android/ashmem.c

+8 −4
Original line number Diff line number Diff line
@@ -112,15 +112,19 @@ static struct kmem_cache *ashmem_range_cachep __read_mostly; 
#define page_range_subsumed_by_range(range, start, end) \

	(((range)->pgstart <= (start)) && ((range)->pgend >= (end)))



#define page_in_range(range, page) \

	(((range)->pgstart <= (page)) && ((range)->pgend >= (page)))

static inline int page_in_range(struct ashmem_range *range, size_t page)

{

	return (((range)->pgstart <= (page)) && ((range)->pgend >= (page)));

}



#define page_range_in_range(range, start, end) \

	(page_in_range(range, start) || page_in_range(range, end) || \

		page_range_subsumes_range(range, start, end))



#define range_before_page(range, page) \

	((range)->pgend < (page))

static inline int range_before_page(struct ashmem_range *range, size_t page)

{

	return ((range)->pgend < (page));

}



#define PROT_MASK		(PROT_EXEC | PROT_READ | PROT_WRITE)