Commit ad667d62 authored by Przemek Kitszel's avatar Przemek Kitszel Committed by Tony Nguyen
Browse files

ice: remove null checks before devm_kfree() calls 



We all know they are redundant.

Reviewed-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarMichal Wilczynski <michal.wilczynski@intel.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Tested-by: Arpana Arland <arpanax.arland@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f9827747

drivers/net/ethernet/intel/ice/ice_common.c

+2 −4
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 
				devm_kfree(ice_hw_to_dev(hw), lst_itr);

			}

		}

		if (recps[i].root_buf)

		devm_kfree(ice_hw_to_dev(hw), recps[i].root_buf);

	}

	ice_rm_all_sw_replay_rule_info(hw);
@@ -1011,7 +1010,6 @@ static int ice_cfg_fw_log(struct ice_hw *hw, bool enable) 
	}



out:

	if (data)

	devm_kfree(ice_hw_to_dev(hw), data);



	return status;

drivers/net/ethernet/intel/ice/ice_controlq.c

+1 −2
Original line number Diff line number Diff line
@@ -339,7 +339,6 @@ do { \ 
		}							\

	}								\

	/* free the buffer info list */					\

	if ((qi)->ring.cmd_buf)						\

	devm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);		\

	/* free DMA head */						\

	devm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head);		\

drivers/net/ethernet/intel/ice/ice_flow.c

+3 −20
Original line number Diff line number Diff line
@@ -1303,23 +1303,6 @@ ice_flow_find_prof_id(struct ice_hw *hw, enum ice_block blk, u64 prof_id) 
	return NULL;

}



/**

 * ice_dealloc_flow_entry - Deallocate flow entry memory

 * @hw: pointer to the HW struct

 * @entry: flow entry to be removed

 */

static void

ice_dealloc_flow_entry(struct ice_hw *hw, struct ice_flow_entry *entry)

{

	if (!entry)

		return;



	if (entry->entry)

		devm_kfree(ice_hw_to_dev(hw), entry->entry);



	devm_kfree(ice_hw_to_dev(hw), entry);

}



/**

 * ice_flow_rem_entry_sync - Remove a flow entry

 * @hw: pointer to the HW struct
@@ -1335,7 +1318,8 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, enum ice_block __always_unused blk, 


	list_del(&entry->l_entry);



	ice_dealloc_flow_entry(hw, entry);

	devm_kfree(ice_hw_to_dev(hw), entry->entry);

	devm_kfree(ice_hw_to_dev(hw), entry);



	return 0;

}
@@ -1662,7 +1646,6 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id, 


out:

	if (status && e) {

		if (e->entry)

		devm_kfree(ice_hw_to_dev(hw), e->entry);

		devm_kfree(ice_hw_to_dev(hw), e);

	}

drivers/net/ethernet/intel/ice/ice_lib.c

+14 −28
Original line number Diff line number Diff line
@@ -321,32 +321,20 @@ static void ice_vsi_free_arrays(struct ice_vsi *vsi) 


	dev = ice_pf_to_dev(pf);



	if (vsi->af_xdp_zc_qps) {

	bitmap_free(vsi->af_xdp_zc_qps);

	vsi->af_xdp_zc_qps = NULL;

	}

	/* free the ring and vector containers */

	if (vsi->q_vectors) {

	devm_kfree(dev, vsi->q_vectors);

	vsi->q_vectors = NULL;

	}

	if (vsi->tx_rings) {

	devm_kfree(dev, vsi->tx_rings);

	vsi->tx_rings = NULL;

	}

	if (vsi->rx_rings) {

	devm_kfree(dev, vsi->rx_rings);

	vsi->rx_rings = NULL;

	}

	if (vsi->txq_map) {

	devm_kfree(dev, vsi->txq_map);

	vsi->txq_map = NULL;

	}

	if (vsi->rxq_map) {

	devm_kfree(dev, vsi->rxq_map);

	vsi->rxq_map = NULL;

}

}



/**

 * ice_vsi_free_stats - Free the ring statistics structures
@@ -902,9 +890,7 @@ static void ice_rss_clean(struct ice_vsi *vsi) 


	dev = ice_pf_to_dev(pf);



	if (vsi->rss_hkey_user)

	devm_kfree(dev, vsi->rss_hkey_user);

	if (vsi->rss_lut_user)

	devm_kfree(dev, vsi->rss_lut_user);



	ice_vsi_clean_rss_flow_fld(vsi);

drivers/net/ethernet/intel/ice/ice_sched.c

+3 −8
Original line number Diff line number Diff line
@@ -358,10 +358,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node) 
				node->sibling;

	}



	/* leaf nodes have no children */

	if (node->children)

	devm_kfree(ice_hw_to_dev(hw), node->children);



	kfree(node->name);

	xa_erase(&pi->sched_node_ids, node->id);

	devm_kfree(ice_hw_to_dev(hw), node);
@@ -859,10 +856,8 @@ void ice_sched_cleanup_all(struct ice_hw *hw) 
	if (!hw)

		return;



	if (hw->layer_info) {

	devm_kfree(ice_hw_to_dev(hw), hw->layer_info);

	hw->layer_info = NULL;

	}



	ice_sched_clear_port(hw->port_info);