diff mbox series

[26/27] net/ice/base: remove unused struct member

Message ID	20201215060519.302145-27-qi.z.zhang@intel.com (mailing list archive)
State	Accepted, archived
Delegated to:	Qi Zhang
Headers	IronPort-SDR: xX9w2pRwn5k1o1H71U6aigS8mFwClXl2EroJWM1seavSWyN5TjkMeaV+2qliiPSqrJl36j9Xrh /3oOjew81H2A== IronPort-SDR: eFHDbJDdUwUv/zHo+iXmWh6sW8/C2WRJoHInEO0489EUG2L5neNeNRL3Tpmbc5pzf8BCLKaytf 6D+fjNL+9LoA== From: Qi Zhang <qi.z.zhang@intel.com> To: qiming.yang@intel.com Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, Jesse Brandeburg <jesse.brandeburg@intel.com> Date: Tue, 15 Dec 2020 14:05:18 +0800 Message-Id: <20201215060519.302145-27-qi.z.zhang@intel.com> In-Reply-To: <20201215060519.302145-1-qi.z.zhang@intel.com> References: <20201215060519.302145-1-qi.z.zhang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 26/27] net/ice/base: remove unused struct member Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice base code update \| [00/27] ice base code update [01/27] net/ice/base: modify ptype map for UDP [02/27] net/ice/base: increased control queue timeout [03/27] net/ice/base: read more security revision options [04/27] net/ice/base: refactor interface for flash read [05/27] net/ice/base: allow reading inactive flash security revision [06/27] net/ice/base: allow reading arbitrary size data with flash read [07/27] net/ice/base: read Option ROM combo version from CIVD section [08/27] net/ice/base: implement inactive NVM version get [09/27] net/ice/base: support GTP filtering via advanced switch filter [10/27] net/ice/base: cleanup some macros [11/27] net/ice/base: add definitions for FW health status codes [12/27] net/ice/base: add function for NVM checksum verification [13/27] net/ice/base: add condition to copy module info into memory [14/27] net/ice/base: add interface to support configuring VLAN mode [15/27] net/ice/base: support VXLAN VNI field in FDIR [16/27] net/ice/base: fix incorrect tunnel destroy [17/27] net/ice/base: add functionality to check if DVM is supported [18/27] net/ice/base: resend some AQ commands when EBUSY [19/27] net/ice/base: change get PHY capability error level [20/27] net/ice/base: modify recursive way of adding nodes [21/27] net/ice/base: fix for dereference of null pointer [22/27] net/ice/base: use Mode 4 to get PHY Abilites [23/27] net/ice/base: align macro names to the specification [24/27] net/ice/base: add eCPRI over MAC type 0 flow support [25/27] net/ice/base: add eCPRI over UDP type 0 flow support [26/27] net/ice/base: remove unused struct member [27/27] net/ice/base: change a structure

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Qi Zhang Dec. 15, 2020, 6:05 a.m. UTC

  The only time you can ever have a rq_last_status is if
a firmware event was somehow reporting a status on the receive
queue, which are generally firmware initiated events or
mailbox messages from a VF.  Mostly this struct member was unused.

Fix this problem by still printing the value of the field in a debug
print, but don't store the value forever in a struct, potentially
creating opportunities for callers to use the wrong struct member.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/base/ice_controlq.c | 6 +++---
 drivers/net/ice/base/ice_controlq.h | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_controlq.c b/drivers/net/ice/base/ice_controlq.c
index 4c4f92552b..59e7c5f88d 100644
--- a/drivers/net/ice/base/ice_controlq.c
+++ b/drivers/net/ice/base/ice_controlq.c
@@ -1110,6 +1110,7 @@  ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq,
 		  struct ice_rq_event_info *e, u16 *pending)
 {
 	u16 ntc = cq->rq.next_to_clean;
+	enum ice_aq_err rq_last_status;
 	enum ice_status ret_code = ICE_SUCCESS;
 	struct ice_aq_desc *desc;
 	struct ice_dma_mem *bi;
@@ -1143,13 +1144,12 @@  ice_clean_rq_elem(struct ice_hw *hw, struct ice_ctl_q_info *cq,
 	desc = ICE_CTL_Q_DESC(cq->rq, ntc);
 	desc_idx = ntc;
 
-	cq->rq_last_status = (enum ice_aq_err)LE16_TO_CPU(desc->retval);
+	rq_last_status = (enum ice_aq_err)LE16_TO_CPU(desc->retval);
 	flags = LE16_TO_CPU(desc->flags);
 	if (flags & ICE_AQ_FLAG_ERR) {
 		ret_code = ICE_ERR_AQ_ERROR;
 		ice_debug(hw, ICE_DBG_AQ_MSG, "Control Receive Queue Event 0x%04X received with error 0x%X\n",
-			  LE16_TO_CPU(desc->opcode),
-			  cq->rq_last_status);
+			  LE16_TO_CPU(desc->opcode), rq_last_status);
 	}
 	ice_memcpy(&e->desc, desc, sizeof(e->desc), ICE_DMA_TO_NONDMA);
 	datalen = LE16_TO_CPU(desc->datalen);
diff --git a/drivers/net/ice/base/ice_controlq.h b/drivers/net/ice/base/ice_controlq.h
index 84c114f7a4..161c1bebff 100644
--- a/drivers/net/ice/base/ice_controlq.h
+++ b/drivers/net/ice/base/ice_controlq.h
@@ -84,7 +84,6 @@  struct ice_rq_event_info {
 /* Control Queue information */
 struct ice_ctl_q_info {
 	enum ice_ctl_q qtype;
-	enum ice_aq_err rq_last_status;	/* last status on receive queue */
 	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 */