Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Markus Elfring and committed by
David S. Miller
9686f310 a6947174

+5 -13
+3 -8
drivers/net/ethernet/cavium/liquidio/octeon_device.c
··· 650 650 651 651 for (i = 0; i < MAX_OCTEON_OUTPUT_QUEUES; i++) { 652 652 /* could check mask as well */ 653 - if (oct->droq[i]) 654 - vfree(oct->droq[i]); 653 + vfree(oct->droq[i]); 655 654 } 656 655 657 656 for (i = 0; i < MAX_OCTEON_INSTR_QUEUES; i++) { 658 657 /* could check mask as well */ 659 - if (oct->instr_queue[i]) 660 - vfree(oct->instr_queue[i]); 658 + vfree(oct->instr_queue[i]); 661 659 } 662 660 663 661 i = oct->octeon_id; ··· 1076 1078 oct->dispatch.count--; 1077 1079 1078 1080 spin_unlock_bh(&oct->dispatch.lock); 1079 - 1080 - if (dfree) 1081 - vfree(dfree); 1082 - 1081 + vfree(dfree); 1083 1082 return retval; 1084 1083 } 1085 1084
+1 -3
drivers/net/ethernet/cavium/liquidio/octeon_droq.c
··· 216 216 dev_dbg(&oct->pci_dev->dev, "%s[%d]\n", __func__, q_no); 217 217 218 218 octeon_droq_destroy_ring_buffers(oct, droq); 219 - 220 - if (droq->recv_buf_list) 221 - vfree(droq->recv_buf_list); 219 + vfree(droq->recv_buf_list); 222 220 223 221 if (droq->info_base_addr) 224 222 cnnic_free_aligned_dma(oct->pci_dev, droq->info_list,
+1 -2
drivers/net/ethernet/cavium/liquidio/request_manager.c
··· 175 175 desc_size = 176 176 CFG_GET_IQ_INSTR_TYPE(CHIP_FIELD(oct, cn6xxx, conf)); 177 177 178 - if (iq->request_list) 179 - vfree(iq->request_list); 178 + vfree(iq->request_list); 180 179 181 180 if (iq->base_addr) { 182 181 q_size = iq->max_count * desc_size;