ion: convert sg_dma_len(sg) to sg->length

ion is always dealing with the allocation and not the mapping,
so it should always be using sg->length and not sg->dma_length.

Signed-off-by: Colin Cross <ccross@android.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
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 4bdbdece3f30c450da942a76fd10a365e2668f1f..8d568caa0f33e63e7175af1cbf1bad5196f80745 100644 (file)
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -224,7 +224,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
                for_each_sg(table->sgl, sg, table->nents, i) {
                        struct page *page = sg_page(sg);
 
-                       for (j = 0; j < sg_dma_len(sg) / PAGE_SIZE; j++)
+                       for (j = 0; j < sg->length / PAGE_SIZE; j++)
                                buffer->pages[k++] = page++;
                }
 

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 2fddc041ac1313039f4a8c3e3246ae7f3f9e3a4b..62f7439e02b1f9a4c6000106aadb64db2a68e0f6 100644 (file)
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -84,7 +84,7 @@ err:
        sg = table->sgl;
        for (i -= 1; i >= 0; i--) {
                gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
-                             sg_dma_len(sg));
+                             sg->length);
                sg = sg_next(sg);
        }
        sg_free_table(table);
@@ -112,7 +112,7 @@ static void ion_chunk_heap_free(struct ion_buffer *buffer)
 
        for_each_sg(table->sgl, sg, table->nents, i) {
                gen_pool_free(chunk_heap->pool, page_to_phys(sg_page(sg)),
-                             sg_dma_len(sg));
+                             sg->length);
        }
        chunk_heap->allocated -= allocated_size;
        sg_free_table(table);

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index a584ec0368624881c4d6fb7b816f8cce8b2037f2..a5a7c572ad2aa09985f5652f392a9f5d111c7004 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -46,7 +46,7 @@ void *ion_heap_map_kernel(struct ion_heap *heap,
                pgprot = pgprot_writecombine(PAGE_KERNEL);
 
        for_each_sg(table->sgl, sg, table->nents, i) {
-               int npages_this_entry = PAGE_ALIGN(sg_dma_len(sg)) / PAGE_SIZE;
+               int npages_this_entry = PAGE_ALIGN(sg->length) / PAGE_SIZE;
                struct page *page = sg_page(sg);
                BUG_ON(i >= npages);
                for (j = 0; j < npages_this_entry; j++) {
@@ -80,14 +80,14 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
        for_each_sg(table->sgl, sg, table->nents, i) {
                struct page *page = sg_page(sg);
                unsigned long remainder = vma->vm_end - addr;
-               unsigned long len = sg_dma_len(sg);
+               unsigned long len = sg->length;
 
-               if (offset >= sg_dma_len(sg)) {
-                       offset -= sg_dma_len(sg);
+               if (offset >= sg->length) {
+                       offset -= sg->length;
                        continue;
                } else if (offset) {
                        page += offset / PAGE_SIZE;
-                       len = sg_dma_len(sg) - offset;
+                       len = sg->length - offset;
                        offset = 0;
                }
                len = min(len, remainder);
@@ -119,7 +119,7 @@ int ion_heap_buffer_zero(struct ion_buffer *buffer)
 
        for_each_sg(table->sgl, sg, table->nents, i) {
                struct page *page = sg_page(sg);
-               unsigned long len = sg_dma_len(sg);
+               unsigned long len = sg->length;
 
                for (j = 0; j < len / PAGE_SIZE; j++) {
                        struct page *sub_page = page + j;

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 792cade3e4043d0d70c13e601f1963fbe28db4ba..967eedc3af84ebd1f38c942d93a064206a615237 100644 (file)
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -209,7 +209,7 @@ void ion_system_heap_free(struct ion_buffer *buffer)
 
        for_each_sg(table->sgl, sg, table->nents, i)
                free_buffer_page(sys_heap, buffer, sg_page(sg),
-                               get_order(sg_dma_len(sg)));
+                               get_order(sg->length));
        sg_free_table(table);
        kfree(table);
 }