android: binder: Refactor prev and next buffer into a helper function

Use helper functions buffer_next and buffer_prev instead
of list_entry to get the next and previous buffers.

Signed-off-by: Sherry Yang <sherryy@android.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 15 insertions, 9 deletions

diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index 40f31df60580..f15af2b55a62 100644
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -48,14 +48,23 @@ module_param_named(debug_mask, binder_alloc_debug_mask,
                         pr_info(x); \
         } while (0)
 
+static struct binder_buffer *binder_buffer_next(struct binder_buffer *buffer)
+{
+        return list_entry(buffer->entry.next, struct binder_buffer, entry);
+}
+
+static struct binder_buffer *binder_buffer_prev(struct binder_buffer *buffer)
+{
+        return list_entry(buffer->entry.prev, struct binder_buffer, entry);
+}
+
 static size_t binder_alloc_buffer_size(struct binder_alloc *alloc,
                                        struct binder_buffer *buffer)
 {
         if (list_is_last(&buffer->entry, &alloc->buffers))
                 return alloc->buffer +
                        alloc->buffer_size - (void *)buffer->data;
-        return (size_t)list_entry(buffer->entry.next,
-                          struct binder_buffer, entry) - (size_t)buffer->data;
+        return (size_t)binder_buffer_next(buffer) - (size_t)buffer->data;
 }
 
 static void binder_insert_free_buffer(struct binder_alloc *alloc,
@@ -470,7 +479,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
         int free_page_start = 1;
 
         BUG_ON(alloc->buffers.next == &buffer->entry);
-        prev = list_entry(buffer->entry.prev, struct binder_buffer, entry);
+        prev = binder_buffer_prev(buffer);
         BUG_ON(!prev->free);
         if (buffer_end_page(prev) == buffer_start_page(buffer)) {
                 free_page_start = 0;
@@ -482,8 +491,7 @@ static void binder_delete_free_buffer(struct binder_alloc *alloc,
         }
 
         if (!list_is_last(&buffer->entry, &alloc->buffers)) {
-                next = list_entry(buffer->entry.next,
-                                  struct binder_buffer, entry);
+                next = binder_buffer_next(buffer);
                 if (buffer_start_page(next) == buffer_end_page(buffer)) {
                         free_page_end = 0;
                         if (buffer_start_page(next) ==
@@ -544,8 +552,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
         rb_erase(&buffer->rb_node, &alloc->allocated_buffers);
         buffer->free = 1;
         if (!list_is_last(&buffer->entry, &alloc->buffers)) {
-                struct binder_buffer *next = list_entry(buffer->entry.next,
-                                                struct binder_buffer, entry);
+                struct binder_buffer *next = binder_buffer_next(buffer);
 
                 if (next->free) {
                         rb_erase(&next->rb_node, &alloc->free_buffers);
@@ -553,8 +560,7 @@ static void binder_free_buf_locked(struct binder_alloc *alloc,
                 }
         }
         if (alloc->buffers.next != &buffer->entry) {
-                struct binder_buffer *prev = list_entry(buffer->entry.prev,
-                                                struct binder_buffer, entry);
+                struct binder_buffer *prev = binder_buffer_prev(buffer);
 
                 if (prev->free) {
                         binder_delete_free_buffer(alloc, buffer);