Browse Source

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>
Markus Elfring 10 years ago
parent
commit
9686f3109a

+ 3 - 8
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++) {
 	for (i = 0; i < MAX_OCTEON_OUTPUT_QUEUES; i++) {
 		/* could check  mask as well */
 		/* 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++) {
 	for (i = 0; i < MAX_OCTEON_INSTR_QUEUES; i++) {
 		/* could check mask as well */
 		/* could check mask as well */
-		if (oct->instr_queue[i])
-			vfree(oct->instr_queue[i]);
+		vfree(oct->instr_queue[i]);
 	}
 	}
 
 
 	i = oct->octeon_id;
 	i = oct->octeon_id;
@@ -1078,10 +1076,7 @@ octeon_unregister_dispatch_fn(struct octeon_device *oct, u16 opcode,
 		oct->dispatch.count--;
 		oct->dispatch.count--;
 
 
 	spin_unlock_bh(&oct->dispatch.lock);
 	spin_unlock_bh(&oct->dispatch.lock);
-
-	if (dfree)
-		vfree(dfree);
-
+	vfree(dfree);
 	return retval;
 	return retval;
 }
 }
 
 

+ 1 - 3
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);
 	dev_dbg(&oct->pci_dev->dev, "%s[%d]\n", __func__, q_no);
 
 
 	octeon_droq_destroy_ring_buffers(oct, droq);
 	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)
 	if (droq->info_base_addr)
 		cnnic_free_aligned_dma(oct->pci_dev, droq->info_list,
 		cnnic_free_aligned_dma(oct->pci_dev, droq->info_list,

+ 1 - 2
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 =
 		desc_size =
 		    CFG_GET_IQ_INSTR_TYPE(CHIP_FIELD(oct, cn6xxx, conf));
 		    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) {
 	if (iq->base_addr) {
 		q_size = iq->max_count * desc_size;
 		q_size = iq->max_count * desc_size;