commit 8d48b6be65262d398558b97eb96590156b4a74f2
author Leonid Lobachev <leonidl@google.com> Mon Sep 23 11:50:56 2019 -0700
committer Jonas Larsson <ljonas@google.com> Thu Oct 31 16:13:49 2019 -0700
tree 18dd2eb916f2d53da724863f4db36d42a83347c4
parent 540cbd6c7c90c20a5474a9f691f15b2b4d897ff5

staging: gasket: page table: remove dead code in coherent mem alloc

gasket_alloc_coherent_memory() has some unnecessary code related to out
of memory checking that will never hit the condition checked, remove.

Change-Id: Ifb09e7ff31d8ae41a486639a2abc6ce26c4d85ef
Signed-off-by: Todd Poynor <toddpoynor@google.com>

drivers/staging/gasket/gasket_page_table.c

diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 0d75a58..bc17f78 100644
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -1299,7 +1299,6 @@
 			GFP_KERNEL);
 	if (!gasket_dev->page_table[index]->coherent_pages)
 		goto nomem;
-	*dma_address = 0;
 
 	gasket_dev->coherent_buffer.length_bytes =
 		PAGE_SIZE * (num_pages);
@@ -1314,15 +1313,12 @@
 			(dma_addr_t)mem + j * PAGE_SIZE;
 	}
 
-	if (*dma_address == 0)
-		goto nomem;
 	return 0;
 
 nomem:
-	if (mem) {
+	if (mem)
 		dma_free_coherent(gasket_get_device(gasket_dev),
 				  num_pages * PAGE_SIZE, mem, handle);
-	}
 
 	kfree(gasket_dev->page_table[index]->coherent_pages);
 	gasket_dev->page_table[index]->coherent_pages = NULL;