With the introduction of ice_cfg_vsi_agg(), the ice_cfg_agg() and ice_move_vsi_to_agg() functions are no longer used. Remove them.
Signed-off-by: Jacob Keller <[email protected]> --- drivers/net/ethernet/intel/ice/ice_sched.h | 6 --- drivers/net/ethernet/intel/ice/ice_sched.c | 61 ------------------------------ 2 files changed, 67 deletions(-) diff --git a/drivers/net/ethernet/intel/ice/ice_sched.h b/drivers/net/ethernet/intel/ice/ice_sched.h index b9ea9174f3d9..30b55bab09d3 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.h +++ b/drivers/net/ethernet/intel/ice/ice_sched.h @@ -140,12 +140,6 @@ int ice_cfg_vsi_agg(struct ice_port_info *pi, u16 vsi_handle, u32 min_id, u32 max_id, u8 tc_bitmap, u32 *configured_id); int -ice_cfg_agg(struct ice_port_info *pi, u32 agg_id, - enum ice_agg_type agg_type, u8 tc_bitmap); -int -ice_move_vsi_to_agg(struct ice_port_info *pi, u32 agg_id, u16 vsi_handle, - u8 tc_bitmap); -int ice_cfg_q_bw_lmt(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 q_handle, enum ice_rl_type rl_type, u32 bw); int diff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c index f0b1924b0411..fbee7863394a 100644 --- a/drivers/net/ethernet/intel/ice/ice_sched.c +++ b/drivers/net/ethernet/intel/ice/ice_sched.c @@ -2777,37 +2777,6 @@ static int ice_sched_cfg_agg(struct ice_port_info *pi, return 0; } -/** - * ice_cfg_agg - config aggregator node - * @pi: port information structure - * @agg_id: aggregator ID - * @agg_type: aggregator type queue, VSI, or aggregator group - * @tc_bitmap: bits TC bitmap - * - * This function configures aggregator node(s). - */ -int -ice_cfg_agg(struct ice_port_info *pi, u32 agg_id, enum ice_agg_type agg_type, - u8 tc_bitmap) -{ - struct ice_sched_agg_info *agg_info; - unsigned long bitmap = tc_bitmap; - struct ice_hw *hw = pi->hw; - int status; - - mutex_lock(&pi->sched_lock); - agg_info = xa_load(&hw->agg_nodes, agg_id); - if (!agg_info) - agg_info = ice_alloc_agg_info(hw, agg_id, agg_id, agg_type); - if (IS_ERR(agg_info)) - return PTR_ERR(agg_info); - status = ice_sched_cfg_agg(pi, agg_info, &bitmap); - if (!status) - ice_save_agg_tc_bitmap(agg_info, &bitmap); - mutex_unlock(&pi->sched_lock); - return status; -} - /** * ice_get_agg_vsi_info - get the aggregator ID * @agg_info: aggregator info @@ -3052,36 +3021,6 @@ ice_sched_cfg_node_bw_alloc(struct ice_hw *hw, struct ice_sched_node *node, return ice_sched_update_elem(hw, node, &buf); } -/** - * ice_move_vsi_to_agg - moves VSI to new or default aggregator - * @pi: port information structure - * @agg_id: aggregator ID - * @vsi_handle: software VSI handle - * @tc_bitmap: TC bitmap of enabled TC(s) - * - * Move or associate VSI to a new or default aggregator node. - */ -int -ice_move_vsi_to_agg(struct ice_port_info *pi, u32 agg_id, u16 vsi_handle, - u8 tc_bitmap) -{ - struct ice_sched_agg_info *agg_info; - unsigned long bitmap = tc_bitmap; - int status; - - mutex_lock(&pi->sched_lock); - agg_info = xa_load(&pi->hw->agg_nodes, agg_id); - if (!agg_info) - return -EINVAL; - status = ice_sched_assoc_vsi_to_agg(pi, agg_info, vsi_handle, - &bitmap); - if (!status) - status = ice_save_agg_vsi_tc_bitmap(agg_info, vsi_handle, - &bitmap); - mutex_unlock(&pi->sched_lock); - return status; -} - /** * ice_find_available_agg - Find or create aggregator node * @pi: port information structure -- 2.56.0.rc0.395.gd1f3524e15dc
