Commit 84817ab6 authored by Michal Schmidt's avatar Michal Schmidt Committed by Tony Nguyen
Browse files

ice: remove ice_ctl_q_info::sq_cmd_timeout 



sq_cmd_timeout is initialized to ICE_CTL_Q_SQ_CMD_TIMEOUT and never
changed, so just use the constant directly.

Suggested-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarMichal Schmidt <mschmidt@redhat.com>
Reviewed-by: default avatarArkadiusz Kubalewski <arkadiusz.kubalewski@intel.com>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Tested-by: Sunitha Mekala <sunithax.d.mekala@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 0ec636e5

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

+1 −1
Original line number Diff line number Diff line
@@ -2000,7 +2000,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res) 
	/* there are some rare cases when trying to release the resource

	 * results in an admin queue timeout, so handle them correctly

	 */

	while ((status == -EIO) && (total_delay < hw->adminq.sq_cmd_timeout)) {

	while ((status == -EIO) && (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT)) {

		mdelay(1);

		status = ice_aq_release_res(hw, res, 0, NULL);

		total_delay++;

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

+1 −4
Original line number Diff line number Diff line
@@ -637,9 +637,6 @@ static int ice_init_ctrlq(struct ice_hw *hw, enum ice_ctl_q q_type) 
		return -EIO;

	}



	/* setup SQ command write back timeout */

	cq->sq_cmd_timeout = ICE_CTL_Q_SQ_CMD_TIMEOUT;



	/* allocate the ATQ */

	ret_code = ice_init_sq(hw, cq);

	if (ret_code)
@@ -1066,7 +1063,7 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, 


		udelay(ICE_CTL_Q_SQ_CMD_USEC);

		total_delay++;

	} while (total_delay < cq->sq_cmd_timeout);

	} while (total_delay < ICE_CTL_Q_SQ_CMD_TIMEOUT);



	/* if ready, copy the desc back to temp */

	if (ice_sq_done(hw, cq)) {

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

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ struct ice_ctl_q_info { 
	enum ice_ctl_q qtype;

	struct ice_ctl_q_ring rq;	/* receive queue */

	struct ice_ctl_q_ring sq;	/* send queue */

	u32 sq_cmd_timeout;		/* send queue cmd write back timeout */

	u16 num_rq_entries;		/* receive queue depth */

	u16 num_sq_entries;		/* send queue depth */

	u16 rq_buf_size;		/* receive queue buffer size */