Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / android / ion / ion_heap.c

diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c
index ca15a87f6fd3d7bd0bee4ca7a77ea488bb8656c8..4e5c0f17f579aec82a8df999680c13f448b78bf2 100644 (file)
--- a/drivers/staging/android/ion/ion_heap.c
+++ b/drivers/staging/android/ion/ion_heap.c
@@ -93,7 +93,7 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer,
                }
                len = min(len, remainder);
                ret = remap_pfn_range(vma, addr, page_to_pfn(page), len,
-                               vma->vm_page_prot);
+                                     vma->vm_page_prot);
                if (ret)
                        return ret;
                addr += len;
@@ -116,7 +116,7 @@ static int ion_heap_clear_pages(struct page **pages, int num, pgprot_t pgprot)
 }
 
 static int ion_heap_sglist_zero(struct scatterlist *sgl, unsigned int nents,
-                                               pgprot_t pgprot)
+                               pgprot_t pgprot)
 {
        int p = 0;
        int ret = 0;
@@ -181,7 +181,7 @@ size_t ion_heap_freelist_size(struct ion_heap *heap)
 }
 
 static size_t _ion_heap_freelist_drain(struct ion_heap *heap, size_t size,
-                               bool skip_pools)
+                                      bool skip_pools)
 {
        struct ion_buffer *buffer;
        size_t total_drained = 0;
@@ -266,7 +266,7 @@ int ion_heap_init_deferred_free(struct ion_heap *heap)
 }
 
 static unsigned long ion_heap_shrink_count(struct shrinker *shrinker,
-                                               struct shrink_control *sc)
+                                          struct shrink_control *sc)
 {
        struct ion_heap *heap = container_of(shrinker, struct ion_heap,
                                             shrinker);
@@ -279,7 +279,7 @@ static unsigned long ion_heap_shrink_count(struct shrinker *shrinker,
 }
 
 static unsigned long ion_heap_shrink_scan(struct shrinker *shrinker,
-                                               struct shrink_control *sc)
+                                         struct shrink_control *sc)
 {
        struct ion_heap *heap = container_of(shrinker, struct ion_heap,
                                             shrinker);