From 3e21ff65d68ab02ecb926383057ab8d537018350 Mon Sep 17 00:00:00 2001 From: Leonid Lobachev Date: Mon, 23 Sep 2019 11:50:56 -0700 Subject: [PATCH] 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 --- gasket_page_table.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gasket_page_table.c b/gasket_page_table.c index 51497d0..a79d9b0 100644 --- a/gasket_page_table.c +++ b/gasket_page_table.c @@ -1299,7 +1299,6 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size, 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 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size, (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;