Commit 06566f5d authored by Heesub Shin's avatar Heesub Shin Committed by Greg Kroah-Hartman
Browse files

staging: ion: remove order argument from free_buffer_page() 



Now that the pages returned from the pool are compound pages, we do not
need to pass the order information to free_buffer_page().

Signed-off-by: default avatarHeesub Shin <heesub.shin@samsung.com>
Reviewed-by: default avatarMitchel Humpherys <mitchelh@codeaurora.org>
Tested-by: default avatarJohn Stultz <john.stultz@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7eb88bff

drivers/staging/android/ion/ion_system_heap.c

+4 −5
Original line number Diff line number Diff line
@@ -78,9 +78,9 @@ static struct page *alloc_buffer_page(struct ion_system_heap *heap, 
}



static void free_buffer_page(struct ion_system_heap *heap,

			     struct ion_buffer *buffer, struct page *page,

			     unsigned int order)

			     struct ion_buffer *buffer, struct page *page)

{

	unsigned int order = compound_order(page);

	bool cached = ion_buffer_cached(buffer);



	if (!cached && !(buffer->private_flags & ION_PRIV_FLAG_SHRINKER_FREE)) {
@@ -171,7 +171,7 @@ static int ion_system_heap_allocate(struct ion_heap *heap, 
	kfree(table);

free_pages:

	list_for_each_entry_safe(page, tmp_page, &pages, lru)

		free_buffer_page(sys_heap, buffer, page, compound_order(page));

		free_buffer_page(sys_heap, buffer, page);

	return -ENOMEM;

}
@@ -191,8 +191,7 @@ static void ion_system_heap_free(struct ion_buffer *buffer) 
		ion_heap_buffer_zero(buffer);



	for_each_sg(table->sgl, sg, table->nents, i)

		free_buffer_page(sys_heap, buffer, sg_page(sg),

				get_order(sg->length));

		free_buffer_page(sys_heap, buffer, sg_page(sg));

	sg_free_table(table);

	kfree(table);

}