net-Liquidio: Delete unnecessary checks before the function call "vfree"

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>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/octeon_device.c b/drivers/net/ethernet/cavium/liquidio/octeon_device.c
index 0d3106b464b29548ddca47eaebb56d08e879b552..f67641a2ff9eff652a7998f4c6d8f8fab873fc63 100644 (file)
--- 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 94b502a0cf33e54b954768688c3e35c056ed1d55..4dba86eaa04559649b012cbeff8707c47a176927 100644 (file)
--- 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 356796bf9b871e82f4e300206e24757072bfa870..a2a24652c8f32826882f82910b76d38c8df49593 100644 (file)
--- 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;