From 3fbba579a2b9ee43e6692ea372da3a7848b174ab Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Mon, 7 Sep 2020 19:03:14 +0800 Subject: [PATCH] net/ice/base: rename function 'xtrct' or 'xtract' is currently used in the code to shorten 'extract'. Rename ice_prgm_acl_prof_extrt() to ice_prgm_acl_prof_xtrct() so we don't have another variation of a 'extract'. Signed-off-by: Tony Nguyen Signed-off-by: Qi Zhang Acked-by: Qiming Yang --- drivers/net/ice/base/ice_acl.c | 4 ++-- drivers/net/ice/base/ice_acl.h | 2 +- drivers/net/ice/base/ice_flow.c | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/base/ice_acl.c b/drivers/net/ice/base/ice_acl.c index 435a0cb518..763cd2af9e 100644 --- a/drivers/net/ice/base/ice_acl.c +++ b/drivers/net/ice/base/ice_acl.c @@ -288,7 +288,7 @@ ice_acl_prof_aq_send(struct ice_hw *hw, u16 opc, u8 prof_id, } /** - * ice_prgm_acl_prof_extrt - program ACL profile extraction sequence + * ice_prgm_acl_prof_xtrct - program ACL profile extraction sequence * @hw: pointer to the HW struct * @prof_id: profile ID * @buf: ptr to buffer @@ -297,7 +297,7 @@ ice_acl_prof_aq_send(struct ice_hw *hw, u16 opc, u8 prof_id, * Program ACL profile extraction (indirect 0x0C1D) */ enum ice_status -ice_prgm_acl_prof_extrt(struct ice_hw *hw, u8 prof_id, +ice_prgm_acl_prof_xtrct(struct ice_hw *hw, u8 prof_id, struct ice_aqc_acl_prof_generic_frmt *buf, struct ice_sq_cd *cd) { diff --git a/drivers/net/ice/base/ice_acl.h b/drivers/net/ice/base/ice_acl.h index be27a545bf..f87a0aa795 100644 --- a/drivers/net/ice/base/ice_acl.h +++ b/drivers/net/ice/base/ice_acl.h @@ -158,7 +158,7 @@ ice_aq_query_actpair(struct ice_hw *hw, u8 act_mem_idx, u16 act_entry_idx, struct ice_aqc_actpair *buf, struct ice_sq_cd *cd); enum ice_status ice_aq_dealloc_acl_res(struct ice_hw *hw, struct ice_sq_cd *cd); enum ice_status -ice_prgm_acl_prof_extrt(struct ice_hw *hw, u8 prof_id, +ice_prgm_acl_prof_xtrct(struct ice_hw *hw, u8 prof_id, struct ice_aqc_acl_prof_generic_frmt *buf, struct ice_sq_cd *cd); enum ice_status diff --git a/drivers/net/ice/base/ice_flow.c b/drivers/net/ice/base/ice_flow.c index 1b0caf6420..1f621ca881 100644 --- a/drivers/net/ice/base/ice_flow.c +++ b/drivers/net/ice/base/ice_flow.c @@ -1780,7 +1780,7 @@ ice_flow_acl_disassoc_scen(struct ice_hw *hw, struct ice_flow_prof *prof) /* Clear scenario for this PF */ buf.pf_scenario_num[hw->pf_id] = ICE_ACL_INVALID_SCEN; - status = ice_prgm_acl_prof_extrt(hw, prof_id, &buf, NULL); + status = ice_prgm_acl_prof_xtrct(hw, prof_id, &buf, NULL); return status; } @@ -2082,7 +2082,7 @@ ice_flow_acl_set_xtrct_seq(struct ice_hw *hw, struct ice_flow_prof *prof) /* Update the current PF */ buf.pf_scenario_num[hw->pf_id] = (u8)prof->cfg.scen->id; - status = ice_prgm_acl_prof_extrt(hw, prof_id, &buf, NULL); + status = ice_prgm_acl_prof_xtrct(hw, prof_id, &buf, NULL); return status; } @@ -2510,7 +2510,6 @@ ice_flow_acl_frmt_entry(struct ice_hw *hw, struct ice_flow_prof *prof, e->acts = (struct ice_flow_action *) ice_memdup(hw, acts, acts_cnt * sizeof(*acts), ICE_NONDMA_TO_NONDMA); - if (!e->acts) goto out; -- 2.20.1