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.

Signed-off-by: Todd Poynor <toddpoynor@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
index 2e1de8ad4a2c63fe442cca529433bf37f3ad2e0b..985a3a93499d5e34b4914124d72a67e4e071fc59 100644 (file)
--- a/drivers/staging/gasket/gasket_page_table.c
+++ b/drivers/staging/gasket/gasket_page_table.c
@@ -1316,7 +1316,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);
@@ -1331,15 +1330,12 @@ int gasket_alloc_coherent_memory(struct gasket_dev *gasket_dev, u64 size,
                        (u64)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;