[PATCH] qlcnic: Remove redundant NULL check before kfree
DORMANTno replies
From: Syam Sidhardhan <hidden>
Date: 2013-02-26 19:55:50
Subsystem:
networking drivers, qlogic qlcnic (1/10)gb ethernet driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Shahed Shaikh, Manish Chopra, Linus Torvalds
kfree on NULL pointer is a no-op. Signed-off-by: Syam Sidhardhan <redacted> --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 28a6d48..b4c33c2 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c@@ -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);
--
1.7.9.5