From 5c4b7e975b8142374c05450740d128b78280a822 Mon Sep 17 00:00:00 2001 From: Hridya Valsaraju Date: Sun, 2 Aug 2020 22:55:53 -0700 Subject: [PATCH] ANDROID: staging: ion: Delete unused functions in ion_heap.c They were deleted in 5d41593935d9(staging: ion: refactor ion's heap manipulators into a separate file) but was accidentally added back in a64320f5b8e4(Merge 94709049fb84). Fixes: a64320f5b8e4 ("Merge 94709049fb84 ("Merge branch 'akpm' (patches from Andrew)") into android-mainline") Change-Id: I757bd09a26eda06317ce467dff9c3f275204723c Signed-off-by: Hridya Valsaraju --- drivers/staging/android/ion/ion_heap.c | 44 -------------------------- 1 file changed, 44 deletions(-) diff --git a/drivers/staging/android/ion/ion_heap.c b/drivers/staging/android/ion/ion_heap.c index 37a1d9226516..e102f6a2ecf6 100644 --- a/drivers/staging/android/ion/ion_heap.c +++ b/drivers/staging/android/ion/ion_heap.c @@ -205,50 +205,6 @@ int ion_heap_map_user(struct ion_heap *heap, struct ion_buffer *buffer, } EXPORT_SYMBOL_GPL(ion_heap_map_user); -static int ion_heap_clear_pages(struct page **pages, int num, pgprot_t pgprot) -{ - void *addr = vmap(pages, num, VM_MAP, pgprot); - - if (!addr) - return -ENOMEM; - memset(addr, 0, PAGE_SIZE * num); - vunmap(addr); - - return 0; -} - -static int ion_heap_sglist_zero(struct scatterlist *sgl, unsigned int nents, - pgprot_t pgprot) -{ - int p = 0; - int ret = 0; - struct sg_page_iter piter; - struct page *pages[32]; - - for_each_sg_page(sgl, &piter, nents, 0) { - pages[p++] = sg_page_iter_page(&piter); - if (p == ARRAY_SIZE(pages)) { - ret = ion_heap_clear_pages(pages, p, pgprot); - if (ret) - return ret; - p = 0; - } - } - if (p) - ret = ion_heap_clear_pages(pages, p, pgprot); - - return ret; -} - -int ion_heap_pages_zero(struct page *page, size_t size, pgprot_t pgprot) -{ - struct scatterlist sg; - - sg_init_table(&sg, 1); - sg_set_page(&sg, page, size, 0); - return ion_heap_sglist_zero(&sg, 1, pgprot); -} - void ion_heap_freelist_add(struct ion_heap *heap, struct ion_buffer *buffer) { spin_lock(&heap->free_lock);