lkml.org 
[lkml]   [2018]   [Oct]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/11] staging: gasket: page table: remove dead code in coherent mem alloc
    Date
    From: Todd Poynor <toddpoynor@google.com>

    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>
    ---
    drivers/staging/gasket/gasket_page_table.c | 6 +-----
    1 file changed, 1 insertion(+), 5 deletions(-)

    diff --git a/drivers/staging/gasket/gasket_page_table.c b/drivers/staging/gasket/gasket_page_table.c
    index 2e1de8ad4a2c6..985a3a93499d5 100644
    --- 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;
    --
    2.19.0.605.g01d371f741-goog
    \
     
     \ /
      Last update: 2018-10-15 07:01    [W:4.094 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site