diff options
| author | Ziyang Xuan <william.xuanziyang@huawei.com> | 2022-05-13 15:29:28 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-05-16 11:40:04 +0100 |
| commit | 1dee43c2c6f159c26684e02a56373bb3b537ab24 (patch) | |
| tree | 2f5258bef0720104502c8a9b8f081e1afd5fdc63 /drivers/net/ethernet/marvell/octeon_ep | |
| parent | e68372efb9feae33467bdbea2654f3d91b2e0466 (diff) | |
| download | linux-1dee43c2c6f159c26684e02a56373bb3b537ab24.tar.gz linux-1dee43c2c6f159c26684e02a56373bb3b537ab24.tar.bz2 linux-1dee43c2c6f159c26684e02a56373bb3b537ab24.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/marvell/octeon_ep')
| -rw-r--r-- | drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/octeon_ep/octep_rx.c | 3 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/octeon_ep/octep_tx.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c index ebf78f6ca82b..94409e329a9a 100644 --- 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 945947ec7723..d9ae0937d17a 100644 --- 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 511552bc3e87..5a520d37bea0 100644 --- 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, |