octeon_ep: delete unnecessary NULL check

vfree(NULL) is safe. NULL check before vfree() is not needed.
Delete them to simplify the code.

Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index ebf78f6ca82be4bcb042446758b68d8fc66cc465..94409e329a9a292c26079c3c8cbb4aa88d67380b 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -980,8 +980,7 @@ static void octep_device_cleanup(struct octep_device *oct)
        dev_info(&oct->pdev->dev, "Cleaning up Octeon Device ...\n");
 
        for (i = 0; i < OCTEP_MAX_VF; i++) {
-               if (oct->mbox[i])
-                       vfree(oct->mbox[i]);
+               vfree(oct->mbox[i]);
                oct->mbox[i] = NULL;
        }
 

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
index 945947ec77239b057dccd9766190dc91b558ca84..d9ae0937d17a8232ccb4083a796f1028d53015aa 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_rx.c
@@ -230,8 +230,7 @@ static int octep_free_oq(struct octep_oq *oq)
 
        octep_oq_free_ring_buffers(oq);
 
-       if (oq->buff_info)
-               vfree(oq->buff_info);
+       vfree(oq->buff_info);
 
        if (oq->desc_ring)
                dma_free_coherent(oq->dev,

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c b/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
index 511552bc3e87a094131acb3e7c313d24ba0f830e..5a520d37bea02459815f868f889053949c4d3ce3 100644 (file)
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_tx.c
@@ -270,8 +270,7 @@ static void octep_free_iq(struct octep_iq *iq)
 
        desc_ring_size = OCTEP_IQ_DESC_SIZE * CFG_GET_IQ_NUM_DESC(oct->conf);
 
-       if (iq->buff_info)
-               vfree(iq->buff_info);
+       vfree(iq->buff_info);
 
        if (iq->desc_ring)
                dma_free_coherent(iq->dev, desc_ring_size,