qlogic: Deletion of unnecessary checks before two function calls

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / qlogic / qlcnic / qlcnic_main.c

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 2528c3fb6b90b6976017082867327ade23a3d70e..a430a34a4434aa78a87cb43d90c805fa83ac8252 100644 (file)
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -294,9 +294,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;
 }
 
@@ -1257,8 +1255,7 @@ qlcnic_check_options(struct qlcnic_adapter *adapter)
        if (ahw->op_mode != QLCNIC_NON_PRIV_FUNC) {
                if (fw_dump->tmpl_hdr == NULL ||
                                adapter->fw_version > prev_fw_version) {
-                       if (fw_dump->tmpl_hdr)
-                               vfree(fw_dump->tmpl_hdr);
+                       vfree(fw_dump->tmpl_hdr);
                        if (!qlcnic_fw_cmd_get_minidump_temp(adapter))
                                dev_info(&pdev->dev,
                                        "Supports FW dump capability\n");
@@ -2374,13 +2371,12 @@ void qlcnic_free_tx_rings(struct qlcnic_adapter *adapter)
 
        for (ring = 0; ring < adapter->drv_tx_rings; ring++) {
                tx_ring = &adapter->tx_ring[ring];
-               if (tx_ring && tx_ring->cmd_buf_arr != NULL) {
+               if (tx_ring) {
                        vfree(tx_ring->cmd_buf_arr);
                        tx_ring->cmd_buf_arr = NULL;
                }
        }
-       if (adapter->tx_ring != NULL)
-               kfree(adapter->tx_ring);
+       kfree(adapter->tx_ring);
 }
 
 int qlcnic_alloc_tx_rings(struct qlcnic_adapter *adapter,
@@ -2758,13 +2754,9 @@ static void qlcnic_remove(struct pci_dev *pdev)
        }
 
        qlcnic_dcb_free(adapter->dcb);
-
        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);
@@ -2932,13 +2924,13 @@ void qlcnic_alloc_lb_filters_mem(struct qlcnic_adapter *adapter)
 
 static void qlcnic_free_lb_filters_mem(struct qlcnic_adapter *adapter)
 {
-       if (adapter->fhash.fmax && adapter->fhash.fhead)
+       if (adapter->fhash.fmax)
                kfree(adapter->fhash.fhead);
 
        adapter->fhash.fhead = NULL;
        adapter->fhash.fmax = 0;
 
-       if (adapter->rx_fhash.fmax && adapter->rx_fhash.fhead)
+       if (adapter->rx_fhash.fmax)
                kfree(adapter->rx_fhash.fhead);
 
        adapter->rx_fhash.fmax = 0;