lkml.org 
[lkml]   [2015]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] net-Liquidio: Delete unnecessary checks before the function call "vfree"
    From: Markus Elfring <elfring@users.sourceforge.net>
    Date: Mon, 29 Jun 2015 12:22:24 +0200

    The vfree() function performs also input parameter validation.
    Thus the test around the call is not needed.

    This issue was detected by using the Coccinelle software.

    Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
    ---
    drivers/net/ethernet/cavium/liquidio/octeon_device.c | 11 +++--------
    drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 4 +---
    drivers/net/ethernet/cavium/liquidio/request_manager.c | 3 +--
    3 files changed, 5 insertions(+), 13 deletions(-)

    diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
    index 0d3106b..f67641a 100644
    --- a/drivers/net/ethernet/cavium/liquidio/octeon_device.c
    +++ b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
    @@ -650,14 +650,12 @@ void octeon_free_device_mem(struct octeon_device *oct)

    for (i = 0; i < MAX_OCTEON_OUTPUT_QUEUES; i++) {
    /* could check mask as well */
    - if (oct->droq[i])
    - vfree(oct->droq[i]);
    + vfree(oct->droq[i]);
    }

    for (i = 0; i < MAX_OCTEON_INSTR_QUEUES; i++) {
    /* could check mask as well */
    - if (oct->instr_queue[i])
    - vfree(oct->instr_queue[i]);
    + vfree(oct->instr_queue[i]);
    }

    i = oct->octeon_id;
    @@ -1078,10 +1076,7 @@ octeon_unregister_dispatch_fn(struct octeon_device *oct, u16 opcode,
    oct->dispatch.count--;

    spin_unlock_bh(&oct->dispatch.lock);
    -
    - if (dfree)
    - vfree(dfree);
    -
    + vfree(dfree);
    return retval;
    }

    diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
    index 94b502a..4dba86e 100644
    --- a/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
    +++ b/drivers/net/ethernet/cavium/liquidio/octeon_droq.c
    @@ -216,9 +216,7 @@ int octeon_delete_droq(struct octeon_device *oct, u32 q_no)
    dev_dbg(&oct->pci_dev->dev, "%s[%d]\n", __func__, q_no);

    octeon_droq_destroy_ring_buffers(oct, droq);
    -
    - if (droq->recv_buf_list)
    - vfree(droq->recv_buf_list);
    + vfree(droq->recv_buf_list);

    if (droq->info_base_addr)
    cnnic_free_aligned_dma(oct->pci_dev, droq->info_list,
    diff --git a/drivers/net/ethernet/cavium/liquidio/request_manager.c b/drivers/net/ethernet/cavium/liquidio/request_manager.c
    index 356796b..a2a2465 100644
    --- a/drivers/net/ethernet/cavium/liquidio/request_manager.c
    +++ b/drivers/net/ethernet/cavium/liquidio/request_manager.c
    @@ -175,8 +175,7 @@ int octeon_delete_instr_queue(struct octeon_device *oct, u32 iq_no)
    desc_size =
    CFG_GET_IQ_INSTR_TYPE(CHIP_FIELD(oct, cn6xxx, conf));

    - if (iq->request_list)
    - vfree(iq->request_list);
    + vfree(iq->request_list);

    if (iq->base_addr) {
    q_size = iq->max_count * desc_size;
    --
    2.4.5


    \
     
     \ /
      Last update: 2015-06-29 13:01    [W:4.071 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site