binder: collapse print_binder_buffer() into caller

[linux-2.6-block.git] / drivers / android / binder_alloc.c

diff --git a/drivers/android/binder_alloc.c b/drivers/android/binder_alloc.c
index edd9714ec9f565003d305ec930115015574aee2d..60c829506d310a8c4fabf30ce7d6190f1879b023 100644 (file)
--- a/drivers/android/binder_alloc.c
+++ b/drivers/android/binder_alloc.c
@@ -978,16 +978,6 @@ void binder_alloc_deferred_release(struct binder_alloc *alloc)
                     __func__, alloc->pid, buffers, page_count);
 }
 
-static void print_binder_buffer(struct seq_file *m, const char *prefix,
-                               struct binder_buffer *buffer)
-{
-       seq_printf(m, "%s %d: %lx size %zd:%zd:%zd %s\n",
-                  prefix, buffer->debug_id, buffer->user_data,
-                  buffer->data_size, buffer->offsets_size,
-                  buffer->extra_buffers_size,
-                  buffer->transaction ? "active" : "delivered");
-}
-
 /**
  * binder_alloc_print_allocated() - print buffer info
  * @m:     seq_file for output via seq_printf()
@@ -999,12 +989,18 @@ static void print_binder_buffer(struct seq_file *m, const char *prefix,
 void binder_alloc_print_allocated(struct seq_file *m,
                                  struct binder_alloc *alloc)
 {
+       struct binder_buffer *buffer;
        struct rb_node *n;
 
        mutex_lock(&alloc->mutex);
-       for (n = rb_first(&alloc->allocated_buffers); n != NULL; n = rb_next(n))
-               print_binder_buffer(m, "  buffer",
-                                   rb_entry(n, struct binder_buffer, rb_node));
+       for (n = rb_first(&alloc->allocated_buffers); n; n = rb_next(n)) {
+               buffer = rb_entry(n, struct binder_buffer, rb_node);
+               seq_printf(m, "  buffer %d: %lx size %zd:%zd:%zd %s\n",
+                          buffer->debug_id, buffer->user_data,
+                          buffer->data_size, buffer->offsets_size,
+                          buffer->extra_buffers_size,
+                          buffer->transaction ? "active" : "delivered");
+       }
        mutex_unlock(&alloc->mutex);
 }