mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-14 04:26:45 +00:00
Code Issues Releases Wiki Activity

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

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

Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Todd Poynor 2018-10-14 21:59:19 -07:00 committed by Greg Kroah-Hartman
parent b1004491c9
commit 02d3718633
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/gasket/gasket_page_table.c
View file

@ -1316,7 +1316,6 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
GFP_KERNEL); GFP_KERNEL);
if (!gasket_dev->page_table[index]->coherent_pages) if (!gasket_dev->page_table[index]->coherent_pages)
goto nomem; goto nomem;
*dma_address = 0;
gasket_dev->coherent_buffer.length_bytes = gasket_dev->coherent_buffer.length_bytes =
PAGE_SIZE * (num_pages); PAGE_SIZE * (num_pages);
@ -1331,15 +1330,12 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
(u64)mem + j * PAGE_SIZE; (u64)mem + j * PAGE_SIZE;
} }
if (*dma_address == 0)
goto nomem;
return 0; return 0;
nomem: nomem:
if (mem) { if (mem)
dma_free_coherent(gasket_get_device(gasket_dev), dma_free_coherent(gasket_get_device(gasket_dev),
num_pages * PAGE_SIZE, mem, handle); num_pages * PAGE_SIZE, mem, handle);
}
kfree(gasket_dev->page_table[index]->coherent_pages); kfree(gasket_dev->page_table[index]->coherent_pages);
gasket_dev->page_table[index]->coherent_pages = NULL; gasket_dev->page_table[index]->coherent_pages = NULL;