Commit 74e7940e authored by Jan Sokolowski's avatar Jan Sokolowski Committed by Tony Nguyen
Browse files

ice: remove unused methods 



Following methods were found to no longer be in use:
ice_is_pca9575_present
ice_mac_fltr_exist
ice_napi_del

Remove them.

Signed-off-by: default avatarJan Sokolowski <jan.sokolowski@intel.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent f54a2a13

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

+0 −15
Original line number Diff line number Diff line
@@ -2943,21 +2943,6 @@ void ice_vsi_dis_irq(struct ice_vsi *vsi) 
		synchronize_irq(vsi->q_vectors[i]->irq.virq);

}



/**

 * ice_napi_del - Remove NAPI handler for the VSI

 * @vsi: VSI for which NAPI handler is to be removed

 */

void ice_napi_del(struct ice_vsi *vsi)

{

	int v_idx;



	if (!vsi->netdev)

		return;



	ice_for_each_q_vector(vsi, v_idx)

		netif_napi_del(&vsi->q_vectors[v_idx]->napi);

}



/**

 * ice_vsi_release - Delete a VSI and free its resources

 * @vsi: the VSI being removed

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

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ void ice_vsi_cfg_netdev_tc(struct ice_vsi *vsi, u8 ena_tc); 
struct ice_vsi *

ice_vsi_setup(struct ice_pf *pf, struct ice_vsi_cfg_params *params);



void ice_napi_del(struct ice_vsi *vsi);



int ice_vsi_release(struct ice_vsi *vsi);



void ice_vsi_close(struct ice_vsi *vsi);

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

+0 −19
Original line number Diff line number Diff line
@@ -3308,25 +3308,6 @@ int ice_read_pca9575_reg_e810t(struct ice_hw *hw, u8 offset, u8 *data) 
	return ice_aq_read_i2c(hw, link_topo, 0, addr, 1, data, NULL);

}



/**

 * ice_is_pca9575_present

 * @hw: pointer to the hw struct

 *

 * Check if the SW IO expander is present in the netlist

 */

bool ice_is_pca9575_present(struct ice_hw *hw)

{

	u16 handle = 0;

	int status;



	if (!ice_is_e810t(hw))

		return false;



	status = ice_get_pca9575_handle(hw, &handle);



	return !status && handle;

}



/**

 * ice_ptp_reset_ts_memory - Reset timestamp memory for all blocks

 * @hw: pointer to the HW struct

drivers/net/ethernet/intel/ice/ice_ptp_hw.h

+0 −1
Original line number Diff line number Diff line
@@ -199,7 +199,6 @@ int ice_ptp_init_phy_e810(struct ice_hw *hw); 
int ice_read_sma_ctrl_e810t(struct ice_hw *hw, u8 *data);

int ice_write_sma_ctrl_e810t(struct ice_hw *hw, u8 data);

int ice_read_pca9575_reg_e810t(struct ice_hw *hw, u8 offset, u8 *data);

bool ice_is_pca9575_present(struct ice_hw *hw);



#define PFTSYN_SEM_BYTES	4

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

+0 −48
Original line number Diff line number Diff line
@@ -3408,54 +3408,6 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id, 
	return status;

}



/**

 * ice_mac_fltr_exist - does this MAC filter exist for given VSI

 * @hw: pointer to the hardware structure

 * @mac: MAC address to be checked (for MAC filter)

 * @vsi_handle: check MAC filter for this VSI

 */

bool ice_mac_fltr_exist(struct ice_hw *hw, u8 *mac, u16 vsi_handle)

{

	struct ice_fltr_mgmt_list_entry *entry;

	struct list_head *rule_head;

	struct ice_switch_info *sw;

	struct mutex *rule_lock; /* Lock to protect filter rule list */

	u16 hw_vsi_id;



	if (!ice_is_vsi_valid(hw, vsi_handle))

		return false;



	hw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);

	sw = hw->switch_info;

	rule_head = &sw->recp_list[ICE_SW_LKUP_MAC].filt_rules;

	if (!rule_head)

		return false;



	rule_lock = &sw->recp_list[ICE_SW_LKUP_MAC].filt_rule_lock;

	mutex_lock(rule_lock);

	list_for_each_entry(entry, rule_head, list_entry) {

		struct ice_fltr_info *f_info = &entry->fltr_info;

		u8 *mac_addr = &f_info->l_data.mac.mac_addr[0];



		if (is_zero_ether_addr(mac_addr))

			continue;



		if (f_info->flag != ICE_FLTR_TX ||

		    f_info->src_id != ICE_SRC_ID_VSI ||

		    f_info->lkup_type != ICE_SW_LKUP_MAC ||

		    f_info->fltr_act != ICE_FWD_TO_VSI ||

		    hw_vsi_id != f_info->fwd_id.hw_vsi_id)

			continue;



		if (ether_addr_equal(mac, mac_addr)) {

			mutex_unlock(rule_lock);

			return true;

		}

	}

	mutex_unlock(rule_lock);

	return false;

}



/**

 * ice_vlan_fltr_exist - does this VLAN filter exist for given VSI

 * @hw: pointer to the hardware structure