Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1245994/?format=api
{ "id": 1245994, "url": "http://patchwork.ozlabs.org/api/patches/1245994/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200227181505.61720-14-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200227181505.61720-14-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-02-27T18:15:04", "name": "[S40,14/15] ice: use variable name more descriptive than type", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f18324d3b792267968659e36223820da4f4e693e", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200227181505.61720-14-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 161280, "url": "http://patchwork.ozlabs.org/api/series/161280/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=161280", "date": "2020-02-27T18:14:51", "name": "[S40,01/15] iavf: Enable support for up to 16 queues", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/161280/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1245994/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1245994/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 48T17n4zK9z9sSq\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 28 Feb 2020 05:16:05 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 386EB86DA6;\n\tThu, 27 Feb 2020 18:16:04 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id 3lzrUnkLTCB4; Thu, 27 Feb 2020 18:16:02 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 01A3486D92;\n\tThu, 27 Feb 2020 18:16:02 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 60A5F1BF3D2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Feb 2020 18:15:57 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 5BE0088002\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Feb 2020 18:15:57 +0000 (UTC)", "from hemlock.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id EESVZSOeSr9x for <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Feb 2020 18:15:54 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 5402485AA0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tThu, 27 Feb 2020 18:15:54 +0000 (UTC)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t27 Feb 2020 10:15:53 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby FMSMGA003.fm.intel.com with ESMTP; 27 Feb 2020 10:15:53 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,492,1574150400\"; d=\"scan'208\";a=\"285408860\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Thu, 27 Feb 2020 10:15:04 -0800", "Message-Id": "<20200227181505.61720-14-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200227181505.61720-1-anthony.l.nguyen@intel.com>", "References": "<20200227181505.61720-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S40 14/15] ice: use variable name more\n\tdescriptive than type", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Bruce Allan <bruce.w.allan@intel.com>\n\nThe variable name 'type' is not very descriptive. Replace instances of\nthose with a variable name that is more descriptive or replace it if not\nneeded.\n\nSigned-off-by: Bruce Allan <bruce.w.allan@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 16 ++++++-------\n drivers/net/ethernet/intel/ice/ice_flow.c | 8 +++----\n drivers/net/ethernet/intel/ice/ice_lib.c | 24 ++++++++++----------\n drivers/net/ethernet/intel/ice/ice_lib.h | 4 ++--\n drivers/net/ethernet/intel/ice/ice_switch.c | 20 ++++++++--------\n 5 files changed, 36 insertions(+), 36 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex f9145a471f4d..ae8a7e622bed 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -820,7 +820,7 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,\n \tbool need_reconfig = false;\n \tstruct ice_port_info *pi;\n \tstruct ice_vsi *pf_vsi;\n-\tu8 type;\n+\tu8 mib_type;\n \tint ret;\n \n \t/* Not DCB capable or capability disabled */\n@@ -835,16 +835,16 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,\n \tpi = pf->hw.port_info;\n \tmib = (struct ice_aqc_lldp_get_mib *)&event->desc.params.raw;\n \t/* Ignore if event is not for Nearest Bridge */\n-\ttype = ((mib->type >> ICE_AQ_LLDP_BRID_TYPE_S) &\n-\t\tICE_AQ_LLDP_BRID_TYPE_M);\n-\tdev_dbg(dev, \"LLDP event MIB bridge type 0x%x\\n\", type);\n-\tif (type != ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID)\n+\tmib_type = ((mib->type >> ICE_AQ_LLDP_BRID_TYPE_S) &\n+\t\t ICE_AQ_LLDP_BRID_TYPE_M);\n+\tdev_dbg(dev, \"LLDP event MIB bridge type 0x%x\\n\", mib_type);\n+\tif (mib_type != ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID)\n \t\treturn;\n \n \t/* Check MIB Type and return if event for Remote MIB update */\n-\ttype = mib->type & ICE_AQ_LLDP_MIB_TYPE_M;\n-\tdev_dbg(dev, \"LLDP event mib type %s\\n\", type ? \"remote\" : \"local\");\n-\tif (type == ICE_AQ_LLDP_MIB_REMOTE) {\n+\tmib_type = mib->type & ICE_AQ_LLDP_MIB_TYPE_M;\n+\tdev_dbg(dev, \"LLDP event mib type %s\\n\", mib_type ? \"remote\" : \"local\");\n+\tif (mib_type == ICE_AQ_LLDP_MIB_REMOTE) {\n \t\t/* Update the remote cached instance and return */\n \t\tret = ice_aq_get_dcb_cfg(pi->hw, ICE_AQ_LLDP_MIB_REMOTE,\n \t\t\t\t\t ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_flow.c b/drivers/net/ethernet/intel/ice/ice_flow.c\nindex d0dbd4143115..07875db08c3f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_flow.c\n+++ b/drivers/net/ethernet/intel/ice/ice_flow.c\n@@ -718,7 +718,7 @@ ice_flow_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id)\n * ice_flow_set_fld_ext - specifies locations of field from entry's input buffer\n * @seg: packet segment the field being set belongs to\n * @fld: field to be set\n- * @type: type of the field\n+ * @field_type: type of the field\n * @val_loc: if not ICE_FLOW_FLD_OFF_INVAL, location of the value to match from\n * entry's input buffer\n * @mask_loc: if not ICE_FLOW_FLD_OFF_INVAL, location of mask value from entry's\n@@ -739,16 +739,16 @@ ice_flow_rem_prof(struct ice_hw *hw, enum ice_block blk, u64 prof_id)\n */\n static void\n ice_flow_set_fld_ext(struct ice_flow_seg_info *seg, enum ice_flow_field fld,\n-\t\t enum ice_flow_fld_match_type type, u16 val_loc,\n+\t\t enum ice_flow_fld_match_type field_type, u16 val_loc,\n \t\t u16 mask_loc, u16 last_loc)\n {\n \tu64 bit = BIT_ULL(fld);\n \n \tseg->match |= bit;\n-\tif (type == ICE_FLOW_FLD_TYPE_RANGE)\n+\tif (field_type == ICE_FLOW_FLD_TYPE_RANGE)\n \t\tseg->range |= bit;\n \n-\tseg->fields[fld].type = type;\n+\tseg->fields[fld].type = field_type;\n \tseg->fields[fld].src.val = val_loc;\n \tseg->fields[fld].src.mask = mask_loc;\n \tseg->fields[fld].src.last = last_loc;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex 7fdea256722b..34b41b1039f1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -9,11 +9,11 @@\n \n /**\n * ice_vsi_type_str - maps VSI type enum to string equivalents\n- * @type: VSI type enum\n+ * @vsi_type: VSI type enum\n */\n-const char *ice_vsi_type_str(enum ice_vsi_type type)\n+const char *ice_vsi_type_str(enum ice_vsi_type vsi_type)\n {\n-\tswitch (type) {\n+\tswitch (vsi_type) {\n \tcase ICE_VSI_PF:\n \t\treturn \"ICE_VSI_PF\";\n \tcase ICE_VSI_VF:\n@@ -350,13 +350,13 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data)\n /**\n * ice_vsi_alloc - Allocates the next available struct VSI in the PF\n * @pf: board private structure\n- * @type: type of VSI\n+ * @vsi_type: type of VSI\n * @vf_id: ID of the VF being configured\n *\n * returns a pointer to a VSI on success, NULL on failure.\n */\n static struct ice_vsi *\n-ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type, u16 vf_id)\n+ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type vsi_type, u16 vf_id)\n {\n \tstruct device *dev = ice_pf_to_dev(pf);\n \tstruct ice_vsi *vsi = NULL;\n@@ -377,13 +377,13 @@ ice_vsi_alloc(struct ice_pf *pf, enum ice_vsi_type type, u16 vf_id)\n \tif (!vsi)\n \t\tgoto unlock_pf;\n \n-\tvsi->type = type;\n+\tvsi->type = vsi_type;\n \tvsi->back = pf;\n \tset_bit(__ICE_DOWN, vsi->state);\n \n \tvsi->idx = pf->next_vsi;\n \n-\tif (type == ICE_VSI_VF)\n+\tif (vsi_type == ICE_VSI_VF)\n \t\tice_vsi_set_num_qs(vsi, vf_id);\n \telse\n \t\tice_vsi_set_num_qs(vsi, ICE_INVAL_VFID);\n@@ -2119,7 +2119,7 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)\n * ice_vsi_setup - Set up a VSI by a given type\n * @pf: board private structure\n * @pi: pointer to the port_info instance\n- * @type: VSI type\n+ * @vsi_type: VSI type\n * @vf_id: defines VF ID to which this VSI connects. This field is meant to be\n * used only for ICE_VSI_VF VSI type. For other VSI types, should\n * fill-in ICE_INVAL_VFID as input.\n@@ -2131,7 +2131,7 @@ void ice_cfg_sw_lldp(struct ice_vsi *vsi, bool tx, bool create)\n */\n struct ice_vsi *\n ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n-\t enum ice_vsi_type type, u16 vf_id)\n+\t enum ice_vsi_type vsi_type, u16 vf_id)\n {\n \tu16 max_txqs[ICE_MAX_TRAFFIC_CLASS] = { 0 };\n \tstruct device *dev = ice_pf_to_dev(pf);\n@@ -2139,10 +2139,10 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \tstruct ice_vsi *vsi;\n \tint ret, i;\n \n-\tif (type == ICE_VSI_VF)\n-\t\tvsi = ice_vsi_alloc(pf, type, vf_id);\n+\tif (vsi_type == ICE_VSI_VF)\n+\t\tvsi = ice_vsi_alloc(pf, vsi_type, vf_id);\n \telse\n-\t\tvsi = ice_vsi_alloc(pf, type, ICE_INVAL_VFID);\n+\t\tvsi = ice_vsi_alloc(pf, vsi_type, ICE_INVAL_VFID);\n \n \tif (!vsi) {\n \t\tdev_err(dev, \"could not allocate VSI\\n\");\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.h b/drivers/net/ethernet/intel/ice/ice_lib.h\nindex a83856f8e12b..f77ddd6883c3 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.h\n@@ -6,7 +6,7 @@\n \n #include \"ice.h\"\n \n-const char *ice_vsi_type_str(enum ice_vsi_type type);\n+const char *ice_vsi_type_str(enum ice_vsi_type vsi_type);\n \n int\n ice_add_mac_to_list(struct ice_vsi *vsi, struct list_head *add_list,\n@@ -60,7 +60,7 @@ int ice_vsi_cfg_tc(struct ice_vsi *vsi, u8 ena_tc);\n \n struct ice_vsi *\n ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n-\t enum ice_vsi_type type, u16 vf_id);\n+\t enum ice_vsi_type vsi_type, u16 vf_id);\n \n void ice_napi_del(struct ice_vsi *vsi);\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex e8f43e7b7e8b..eeb1b0e6f716 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -605,7 +605,7 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw)\n \t\t\tstruct ice_aqc_get_sw_cfg_resp_elem *ele;\n \t\t\tu16 pf_vf_num, swid, vsi_port_num;\n \t\t\tbool is_vf = false;\n-\t\t\tu8 type;\n+\t\t\tu8 res_type;\n \n \t\t\tele = rbuf[i].elements;\n \t\t\tvsi_port_num = le16_to_cpu(ele->vsi_port_num) &\n@@ -620,16 +620,16 @@ enum ice_status ice_get_initial_sw_cfg(struct ice_hw *hw)\n \t\t\t ICE_AQC_GET_SW_CONF_RESP_IS_VF)\n \t\t\t\tis_vf = true;\n \n-\t\t\ttype = le16_to_cpu(ele->vsi_port_num) >>\n+\t\t\tres_type = le16_to_cpu(ele->vsi_port_num) >>\n \t\t\t\tICE_AQC_GET_SW_CONF_RESP_TYPE_S;\n \n-\t\t\tif (type == ICE_AQC_GET_SW_CONF_RESP_VSI) {\n+\t\t\tif (res_type == ICE_AQC_GET_SW_CONF_RESP_VSI) {\n \t\t\t\t/* FW VSI is not needed. Just continue. */\n \t\t\t\tcontinue;\n \t\t\t}\n \n \t\t\tice_init_port_info(hw->port_info, vsi_port_num,\n-\t\t\t\t\t type, swid, pf_vf_num, is_vf);\n+\t\t\t\t\t res_type, swid, pf_vf_num, is_vf);\n \t\t}\n \t} while (req_desc && !status);\n \n@@ -985,7 +985,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n \tstruct ice_aqc_sw_rules_elem *s_rule;\n \tenum ice_status status;\n \tu16 s_rule_size;\n-\tu16 type;\n+\tu16 rule_type;\n \tint i;\n \n \tif (!num_vsi)\n@@ -997,11 +997,11 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n \t lkup_type == ICE_SW_LKUP_ETHERTYPE_MAC ||\n \t lkup_type == ICE_SW_LKUP_PROMISC ||\n \t lkup_type == ICE_SW_LKUP_PROMISC_VLAN)\n-\t\ttype = remove ? ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR :\n-\t\t\t\tICE_AQC_SW_RULES_T_VSI_LIST_SET;\n+\t\trule_type = remove ? ICE_AQC_SW_RULES_T_VSI_LIST_CLEAR :\n+\t\t\tICE_AQC_SW_RULES_T_VSI_LIST_SET;\n \telse if (lkup_type == ICE_SW_LKUP_VLAN)\n-\t\ttype = remove ? ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR :\n-\t\t\t\tICE_AQC_SW_RULES_T_PRUNE_LIST_SET;\n+\t\trule_type = remove ? ICE_AQC_SW_RULES_T_PRUNE_LIST_CLEAR :\n+\t\t\tICE_AQC_SW_RULES_T_PRUNE_LIST_SET;\n \telse\n \t\treturn ICE_ERR_PARAM;\n \n@@ -1019,7 +1019,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n \t\t\tcpu_to_le16(ice_get_hw_vsi_num(hw, vsi_handle_arr[i]));\n \t}\n \n-\ts_rule->type = cpu_to_le16(type);\n+\ts_rule->type = cpu_to_le16(rule_type);\n \ts_rule->pdata.vsi_list.number_vsi = cpu_to_le16(num_vsi);\n \ts_rule->pdata.vsi_list.index = cpu_to_le16(vsi_list_id);\n \n", "prefixes": [ "S40", "14/15" ] }