Commit 16c3301b authored Feb 08, 2019 by Brett Creeley Committed by Jeff Kirsher Mar 19, 2019

ice: remove redundant variable and if condition

In ice_pf_rxq_wait we are using an unnecessary local variable and also
we are checking if the timeout time was reached after the loop. Get rid
of the local variable and return 0 right when we get a successful
result. This makes it so we can return -ETIMEDOUT if we ever exit the
loop because we know the timeout time has been hit.

Signed-off-by: Brett Creeley <brett.creeley@intel.com>
Signed-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 77ed84f4

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

+4 −7

Original line number	Diff line number	Diff line
		@@ -175,17 +175,14 @@ static int ice_pf_rxq_wait(struct ice_pf *pf, int pf_q, bool ena)
		int i;

		for (i = 0; i < ICE_Q_WAIT_MAX_RETRY; i++) {
		u32 rx_reg = rd32(&pf->hw, QRX_CTRL(pf_q));

		if (ena == !!(rx_reg & QRX_CTRL_QENA_STAT_M))
		break;
		if (ena == !!(rd32(&pf->hw, QRX_CTRL(pf_q)) &
		QRX_CTRL_QENA_STAT_M))
		return 0;

		usleep_range(20, 40);
		}
		if (i >= ICE_Q_WAIT_MAX_RETRY)
		return -ETIMEDOUT;

		return 0;
		return -ETIMEDOUT;
		}

		/**