Skip to contentSkip to conversation

qlcnic: Remove redundant NULL check before kfree

PATCH New Syam Sidhardhan 1 participant 1 message Feb 26, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qlcnic: Remove redundant NULL check before kfree

kfree on NULL pointer is a no-op.

---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +3 -6
index 28a6d48..b4c33c2 100644
@@ -192,8 +192,7 @@ int qlcnic_alloc_sds_rings(struct qlcnic_recv_context *recv_ctx, int count)
 
 void qlcnic_free_sds_rings(struct qlcnic_recv_context *recv_ctx)
 {
-	if (recv_ctx->sds_rings != NULL)
-		kfree(recv_ctx->sds_rings);
+	kfree(recv_ctx->sds_rings);
 
 	recv_ctx->sds_rings = NULL;
 }
@@ -2038,10 +2037,8 @@ static void qlcnic_remove(struct pci_dev *pdev)
 
 	qlcnic_detach(adapter);
 
-	if (adapter->npars != NULL)
-		kfree(adapter->npars);
-	if (adapter->eswitch != NULL)
-		kfree(adapter->eswitch);
+	kfree(adapter->npars);
+	kfree(adapter->eswitch);
 
 	if (qlcnic_82xx_check(adapter))
 		qlcnic_clr_all_drv_state(adapter, 0);
Signature · 1 line
1.7.9.5