diff mbox series

[v2,30/40] net/ice/base: misc minor ACL changes

Message ID	20200911131954.15999-31-qi.z.zhang@intel.com (mailing list archive)
State	Accepted, archived
Headers	IronPort-SDR: /2mo5CrbqFP05emsM8Zjo4pVCUwH3w7t+Paync+cRzF6wB2FI3JsI0t0aMbRkUC82B4i3bpAnf 5bbmevwu5rkg== IronPort-SDR: 8W8tJAiMzR8TaLNEM4vTYuywyVADfK/ld0bUS5PUk3qAL5flrGX7D9ngXFb+y6/JfE6Kuf0Lj9 IhWdc41vihaQ== From: Qi Zhang <qi.z.zhang@intel.com> To: ferruh.yigit@intel.com Cc: dev@dpdk.org, Qi Zhang <qi.z.zhang@intel.com>, Tony Nguyen <anthony.l.nguyen@intel.com> Date: Fri, 11 Sep 2020 21:19:44 +0800 Message-Id: <20200911131954.15999-31-qi.z.zhang@intel.com> In-Reply-To: <20200911131954.15999-1-qi.z.zhang@intel.com> References: <20200907112826.48493-1-qi.z.zhang@intel.com> <20200911131954.15999-1-qi.z.zhang@intel.com> Subject: [dpdk-dev] [PATCH v2 30/40] net/ice/base: misc minor ACL changes Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	ice base code update \| [v2,00/40] ice base code update [v2,01/40] net/ice/base: handle error gracefully in HW table calloc [v2,02/40] net/ice/base: split caps discover into two functions [v2,03/40] net/ice/base: avoid unnecessary single-member variable-length structs [v2,04/40] net/ice/base: fix issues around move nodes [v2,05/40] net/ice/base: cleanup stack hog [v2,06/40] net/ice/base: clean the code wrapping [v2,07/40] net/ice/base: cleanup misleading comment [v2,08/40] net/ice/base: silence static analysis warning [v2,09/40] net/ice/base: replace single-element array used for C struct hack [v2,10/40] net/ice/base: introduce and use bitmap set API [v2,11/40] net/ice/base: introduce and use bitmap hamming weight API [v2,12/40] net/ice/base: add function header [v2,13/40] net/ice/base: introduce and use for each bit iterator [v2,14/40] net/ice/base: correct abbreviations [v2,15/40] net/ice/base: add AQ cmd 0X0A0A LLDP fltr control [v2,16/40] net/ice/base: add support for GTP-U type switch rule [v2,17/40] net/ice/base: join format strings to same line [v2,18/40] net/ice/base: introduce Tx rate limiting on port level [v2,19/40] net/ice/base: reduce profile to recip info get from firmware [v2,20/40] net/ice/base: refactor DCB related variables [v2,21/40] net/ice/base: support outer IP filter for GTPC [v2,22/40] net/ice/base: support outer IP filter for GTPU without inner IP [v2,23/40] net/ice/base: move a function [v2,24/40] net/ice/base: clear advanced rules in reset preparation [v2,25/40] net/ice/base: move a function [v2,26/40] net/ice/base: add check for failed acts allocation [v2,27/40] net/ice/base: remove repeated words [v2,28/40] net/ice/base: remove function ACL count query [v2,29/40] net/ice/base: preserve NVM capabilities in safe mode [v2,30/40] net/ice/base: misc minor ACL changes [v2,31/40] net/ice/base: adjust rate limit profile ids runtime database [v2,32/40] net/ice/base: enable QinQ filter for switch advanced rule [v2,33/40] net/ice/base: create flash info structure and separate NVM version [v2,34/40] net/ice/base: remove unused parameter [v2,35/40] net/ice/base: minor code clean [v2,36/40] net/ice/base: cache NVM module bank information [v2,37/40] net/ice/base: rename function [v2,38/40] net/ice/base: remove unnecessary conditional [v2,39/40] net/ice/base: rename ACL priority values [v2,40/40] net/ice/base: preserve default aggr vsi information

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Qi Zhang Sept. 11, 2020, 1:19 p.m. UTC

  This is a collection of minor ACL style changes including:

- When there is nothing to unroll, return a value directly.
- Return ICE_SUCCESS(0) in cases where an error was previously checked
  so ICE_SUCCESS is the only possible return.
- Remove unnecessary parentheses and newlines
- Move unroll of allocation to end of function and use goto on errors to
  free.
- Fix function header comment style
- Remove 'else' from an 'if else' condition where both conditions return
  a value to reduce indentation.

Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>
---
 drivers/net/ice/base/ice_acl_ctrl.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_acl_ctrl.c b/drivers/net/ice/base/ice_acl_ctrl.c
index 02a1dd34f..bd09e9d77 100644
--- a/drivers/net/ice/base/ice_acl_ctrl.c
+++ b/drivers/net/ice/base/ice_acl_ctrl.c
@@ -149,10 +149,8 @@  static enum ice_status ice_acl_init_tbl(struct ice_hw *hw)
 	u16 idx;
 
 	tbl = hw->acl_tbl;
-	if (!tbl) {
-		status = ICE_ERR_CFG;
-		return status;
-	}
+	if (!tbl)
+		return ICE_ERR_CFG;
 
 	ice_memset(&buf, 0, sizeof(buf), ICE_NONDMA_MEM);
 	ice_memset(&act_buf, 0, sizeof(act_buf), ICE_NONDMA_MEM);
@@ -526,7 +524,7 @@  ice_acl_alloc_partition(struct ice_hw *hw, struct ice_acl_scen *req)
 			break;
 		}
 
-		row = (dir > 0) ? (row + width) : (row - width);
+		row = dir > 0 ? row + width : row - width;
 		if (row > hw->acl_tbl->last_tcam ||
 		    row < hw->acl_tbl->first_tcam) {
 			/* All rows have been checked. Increment 'off' that
@@ -668,8 +666,7 @@  static void
 ice_acl_assign_act_mem_for_scen(struct ice_acl_tbl *tbl,
 				struct ice_acl_scen *scen,
 				struct ice_aqc_acl_scen *scen_buf,
-				u8 current_tcam_idx,
-				u8 target_tcam_idx)
+				u8 current_tcam_idx, u8 target_tcam_idx)
 {
 	u8 i;
 
@@ -761,10 +758,8 @@  ice_acl_create_scen(struct ice_hw *hw, u16 match_width, u16 num_entries,
 	scen->num_entry = num_entries;
 
 	status = ice_acl_alloc_partition(hw, scen);
-	if (status) {
-		ice_free(hw, scen);
-		return status;
-	}
+	if (status)
+		goto out;
 
 	ice_memset(&scen_buf, 0, sizeof(scen_buf), ICE_NONDMA_MEM);
 
@@ -829,8 +824,7 @@  ice_acl_create_scen(struct ice_hw *hw, u16 match_width, u16 num_entries,
 	if (status) {
 		ice_debug(hw, ICE_DBG_ACL, "AQ allocation of ACL scenario failed. status: %d\n",
 			  status);
-		ice_free(hw, scen);
-		return status;
+		goto out;
 	}
 
 	scen->id = *scen_id;
@@ -838,6 +832,10 @@  ice_acl_create_scen(struct ice_hw *hw, u16 match_width, u16 num_entries,
 	ice_acl_init_entry(scen);
 	LIST_ADD(&scen->list_entry, &hw->acl_tbl->scens);
 
+out:
+	if (status)
+		ice_free(hw, scen);
+
 	return status;
 }