staging: android: ion: Remove unused members from ion_buffer

A few members in ion_buffer struct are unused after features
like page faulting, ion_handle and ion_client were removed.
Remove these members and the leftover references to them.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Acked-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 3a724ca1729c4581454cd3fa5a912cad4e6630a4..c3e601ce261df6ba74c531886ff387bf58c36539 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -115,7 +115,6 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
 
        buffer->dev = dev;
        buffer->size = len;
-       INIT_LIST_HEAD(&buffer->vmas);
        INIT_LIST_HEAD(&buffer->attachments);
        mutex_init(&buffer->lock);
        mutex_lock(&dev->buffer_lock);
@@ -135,7 +134,6 @@ void ion_buffer_destroy(struct ion_buffer *buffer)
        if (WARN_ON(buffer->kmap_cnt > 0))
                buffer->heap->ops->unmap_kernel(buffer->heap, buffer);
        buffer->heap->ops->free(buffer);
-       vfree(buffer->pages);
        kfree(buffer);
 }
 

diff --git a/drivers/staging/android/ion/ion.h b/drivers/staging/android/ion/ion.h
index ace8416bd509b639a16613d704294bcd451a50b2..fa9ed81ab972e360c2a461beaac1bfb2c3699f6a 100644 (file)
--- a/drivers/staging/android/ion/ion.h
+++ b/drivers/staging/android/ion/ion.h
@@ -68,14 +68,6 @@ struct ion_platform_heap {
  * @kmap_cnt:          number of times the buffer is mapped to the kernel
  * @vaddr:             the kernel mapping if kmap_cnt is not zero
  * @sg_table:          the sg table for the buffer if dmap_cnt is not zero
- * @pages:             flat array of pages in the buffer -- used by fault
- *                     handler and only valid for buffers that are faulted in
- * @vmas:              list of vma's mapping this buffer
- * @handle_count:      count of handles referencing this buffer
- * @task_comm:         taskcomm of last client to reference this buffer in a
- *                     handle, used for debugging
- * @pid:               pid of last client to reference this buffer in a
- *                     handle, used for debugging
  */
 struct ion_buffer {
        union {
@@ -92,13 +84,7 @@ struct ion_buffer {
        int kmap_cnt;
        void *vaddr;
        struct sg_table *sg_table;
-       struct page **pages;
-       struct list_head vmas;
        struct list_head attachments;
-       /* used to track orphaned buffers */
-       int handle_count;
-       char task_comm[TASK_COMM_LEN];
-       pid_t pid;
 };
 void ion_buffer_destroy(struct ion_buffer *buffer);