Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1044951/?format=api
{ "id": 1044951, "url": "http://patchwork.ozlabs.org/api/patches/1044951/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190219230414.25627-14-anirudh.venkataramanan@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": "<20190219230414.25627-14-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-02-19T23:04:13", "name": "[S15,13/14] ice: Fix incorrect use of abbreviations", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3ec50fa408f78312d7739d3245fc77871e452e00", "submitter": { "id": 73601, "url": "http://patchwork.ozlabs.org/api/people/73601/?format=api", "name": "Anirudh Venkataramanan", "email": "anirudh.venkataramanan@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/20190219230414.25627-14-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 93015, "url": "http://patchwork.ozlabs.org/api/series/93015/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=93015", "date": "2019-02-19T23:04:04", "name": "Bug fixes and minor clean up for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/93015/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1044951/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1044951/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;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.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 hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\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 443xdl4xC2z9s5c\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 20 Feb 2019 10:24:27 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 250B68655C;\n\tTue, 19 Feb 2019 23:24:26 +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 SNYAz3QwfJs7; Tue, 19 Feb 2019 23:24:19 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id A8A9286258;\n\tTue, 19 Feb 2019 23:24:19 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 12DDF1BF2EA\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 19 Feb 2019 23:04:41 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id EB79022008\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 19 Feb 2019 23:04:40 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id Ooj78RX8o4PD for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 19 Feb 2019 23:04:19 +0000 (UTC)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 58B172338F\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 19 Feb 2019 23:04:17 +0000 (UTC)", "from fmsmga002.fm.intel.com ([10.253.24.26])\n\tby orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t19 Feb 2019 15:04:16 -0800", "from shasta.jf.intel.com ([10.166.241.11])\n\tby fmsmga002.fm.intel.com with ESMTP; 19 Feb 2019 15:04:16 -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.58,388,1544515200\"; d=\"scan'208\";a=\"144858798\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 19 Feb 2019 15:04:13 -0800", "Message-Id": "<20190219230414.25627-14-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.14.5", "In-Reply-To": "<20190219230414.25627-1-anirudh.venkataramanan@intel.com>", "References": "<20190219230414.25627-1-anirudh.venkataramanan@intel.com>", "X-Mailman-Approved-At": "Tue, 19 Feb 2019 23:24:17 +0000", "Subject": "[Intel-wired-lan] [PATCH S15 13/14] ice: Fix incorrect use of\n\tabbreviations", "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>", "MIME-Version": "1.0", "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": "Capitalize abbreviations and spell out some that aren't obvious.\n\nReviewed-by: Bruce Allan <bruce.w.allan@intel.com>\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice.h | 10 +--\n drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 20 ++---\n drivers/net/ethernet/intel/ice/ice_common.c | 94 ++++++++++----------\n drivers/net/ethernet/intel/ice/ice_controlq.c | 10 +--\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 20 ++---\n drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 12 +--\n drivers/net/ethernet/intel/ice/ice_lib.c | 24 ++---\n drivers/net/ethernet/intel/ice/ice_main.c | 74 ++++++++--------\n drivers/net/ethernet/intel/ice/ice_nvm.c | 6 +-\n drivers/net/ethernet/intel/ice/ice_sched.c | 104 +++++++++++-----------\n drivers/net/ethernet/intel/ice/ice_switch.c | 108 +++++++++++------------\n drivers/net/ethernet/intel/ice/ice_switch.h | 10 +--\n drivers/net/ethernet/intel/ice/ice_txrx.c | 20 ++---\n drivers/net/ethernet/intel/ice/ice_type.h | 22 ++---\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 58 ++++++------\n drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 8 +-\n 16 files changed, 300 insertions(+), 300 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h\nindex 576f3d5f77f5..04262049b802 100644\n--- a/drivers/net/ethernet/intel/ice/ice.h\n+++ b/drivers/net/ethernet/intel/ice/ice.h\n@@ -151,7 +151,7 @@ struct ice_tc_info {\n \n struct ice_tc_cfg {\n \tu8 numtc; /* Total number of enabled TCs */\n-\tu8 ena_tc; /* TX map */\n+\tu8 ena_tc; /* Tx map */\n \tstruct ice_tc_info tc_info[ICE_MAX_TRAFFIC_CLASS];\n };\n \n@@ -362,8 +362,8 @@ struct ice_pf {\n \tu32 hw_oicr_idx;\t/* Other interrupt cause vector HW index */\n \tu32 num_avail_hw_msix;\t/* remaining HW MSIX vectors left unclaimed */\n \tu32 num_lan_msix;\t/* Total MSIX vectors for base driver */\n-\tu16 num_lan_tx;\t\t/* num lan Tx queues setup */\n-\tu16 num_lan_rx;\t\t/* num lan Rx queues setup */\n+\tu16 num_lan_tx;\t\t/* num LAN Tx queues setup */\n+\tu16 num_lan_rx;\t\t/* num LAN Rx queues setup */\n \tu16 q_left_tx;\t\t/* remaining num Tx queues left unclaimed */\n \tu16 q_left_rx;\t\t/* remaining num Rx queues left unclaimed */\n \tu16 next_vsi;\t\t/* Next free slot in pf->vsi[] - 0-based! */\n@@ -389,8 +389,8 @@ struct ice_netdev_priv {\n \n /**\n * ice_irq_dynamic_ena - Enable default interrupt generation settings\n- * @hw: pointer to hw struct\n- * @vsi: pointer to vsi struct, can be NULL\n+ * @hw: pointer to HW struct\n+ * @vsi: pointer to VSI struct, can be NULL\n * @q_vector: pointer to q_vector, can be NULL\n */\n static inline void\ndiff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 8ff438968199..757848f85072 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -62,7 +62,7 @@ struct ice_aqc_req_res {\n #define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS\t180000\n #define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS\t1000\n #define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS\t3000\n-\t/* For SDP: pin id of the SDP */\n+\t/* For SDP: pin ID of the SDP */\n \t__le32 res_number;\n \t/* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */\n \t__le16 status;\n@@ -1024,7 +1024,7 @@ struct ice_aqc_get_link_status_data {\n \tu8 ext_info;\n #define ICE_AQ_LINK_PHY_TEMP_ALARM\tBIT(0)\n #define ICE_AQ_LINK_EXCESSIVE_ERRORS\tBIT(1)\t/* Excessive Link Errors */\n-\t/* Port TX Suspended */\n+\t/* Port Tx Suspended */\n #define ICE_AQ_LINK_TX_S\t\t2\n #define ICE_AQ_LINK_TX_M\t\t(0x03 << ICE_AQ_LINK_TX_S)\n #define ICE_AQ_LINK_TX_ACTIVE\t\t0\n@@ -1120,9 +1120,9 @@ struct ice_aqc_nvm {\n };\n \n /**\n- * Send to PF command (indirect 0x0801) id is only used by PF\n+ * Send to PF command (indirect 0x0801) ID is only used by PF\n *\n- * Send to VF command (indirect 0x0802) id is only used by PF\n+ * Send to VF command (indirect 0x0802) ID is only used by PF\n *\n */\n struct ice_aqc_pf_vf_msg {\n@@ -1186,7 +1186,7 @@ struct ice_aqc_get_set_rss_lut {\n \t__le32 addr_low;\n };\n \n-/* Add TX LAN Queues (indirect 0x0C30) */\n+/* Add Tx LAN Queues (indirect 0x0C30) */\n struct ice_aqc_add_txqs {\n \tu8 num_qgrps;\n \tu8 reserved[3];\n@@ -1195,7 +1195,7 @@ struct ice_aqc_add_txqs {\n \t__le32 addr_low;\n };\n \n-/* This is the descriptor of each queue entry for the Add TX LAN Queues\n+/* This is the descriptor of each queue entry for the Add Tx LAN Queues\n * command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp.\n */\n struct ice_aqc_add_txqs_perq {\n@@ -1207,7 +1207,7 @@ struct ice_aqc_add_txqs_perq {\n \tstruct ice_aqc_txsched_elem info;\n };\n \n-/* The format of the command buffer for Add TX LAN Queues (0x0C30)\n+/* The format of the command buffer for Add Tx LAN Queues (0x0C30)\n * is an array of the following structs. Please note that the length of\n * each struct ice_aqc_add_tx_qgrp is variable due\n * to the variable number of queues in each group!\n@@ -1219,7 +1219,7 @@ struct ice_aqc_add_tx_qgrp {\n \tstruct ice_aqc_add_txqs_perq txqs[1];\n };\n \n-/* Disable TX LAN Queues (indirect 0x0C31) */\n+/* Disable Tx LAN Queues (indirect 0x0C31) */\n struct ice_aqc_dis_txqs {\n \tu8 cmd_type;\n #define ICE_AQC_Q_DIS_CMD_S\t\t0\n@@ -1241,7 +1241,7 @@ struct ice_aqc_dis_txqs {\n \t__le32 addr_low;\n };\n \n-/* The buffer for Disable TX LAN Queues (indirect 0x0C31)\n+/* The buffer for Disable Tx LAN Queues (indirect 0x0C31)\n * contains the following structures, arrayed one after the\n * other.\n * Note: Since the q_id is 16 bits wide, if the\n@@ -1498,7 +1498,7 @@ enum ice_adminq_opc {\n \tice_aqc_opc_get_rss_key\t\t\t\t= 0x0B04,\n \tice_aqc_opc_get_rss_lut\t\t\t\t= 0x0B05,\n \n-\t/* TX queue handling commands/events */\n+\t/* Tx queue handling commands/events */\n \tice_aqc_opc_add_txqs\t\t\t\t= 0x0C30,\n \tice_aqc_opc_dis_txqs\t\t\t\t= 0x0C31,\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex aeae0205bec3..3730daf1bc1a 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -31,7 +31,7 @@\n * @hw: pointer to the HW structure\n *\n * This function sets the MAC type of the adapter based on the\n- * vendor ID and device ID stored in the hw structure.\n+ * vendor ID and device ID stored in the HW structure.\n */\n static enum ice_status ice_set_mac_type(struct ice_hw *hw)\n {\n@@ -77,7 +77,7 @@ enum ice_status ice_clear_pf_cfg(struct ice_hw *hw)\n \n /**\n * ice_aq_manage_mac_read - manage MAC address read command\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @buf: a virtual buffer to hold the manage MAC read response\n * @buf_size: Size of the virtual buffer\n * @cd: pointer to command details structure or NULL\n@@ -418,7 +418,7 @@ static void ice_init_flex_flds(struct ice_hw *hw, enum ice_rxdid prof_id)\n \n /**\n * ice_init_fltr_mgmt_struct - initializes filter management list and locks\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n */\n static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)\n {\n@@ -438,7 +438,7 @@ static enum ice_status ice_init_fltr_mgmt_struct(struct ice_hw *hw)\n \n /**\n * ice_cleanup_fltr_mgmt_struct - cleanup filter management list and locks\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n */\n static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)\n {\n@@ -477,7 +477,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw)\n \n /**\n * ice_cfg_fw_log - configure FW logging\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @enable: enable certain FW logging events if true, disable all if false\n *\n * This function enables/disables the FW logging via Rx CQ events and a UART\n@@ -626,7 +626,7 @@ static enum ice_status ice_cfg_fw_log(struct ice_hw *hw, bool enable)\n \n /**\n * ice_output_fw_log\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @desc: pointer to the AQ message descriptor\n * @buf: pointer to the buffer accompanying the AQ message\n *\n@@ -642,7 +642,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)\n \n /**\n * ice_get_itr_intrl_gran - determine int/intrl granularity\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Determines the itr/intrl granularities based on the maximum aggregate\n * bandwidth according to the device's configuration during power-on.\n@@ -731,7 +731,7 @@ enum ice_status ice_init_hw(struct ice_hw *hw)\n \t\tgoto err_unroll_cqinit;\n \t}\n \n-\t/* set the back pointer to hw */\n+\t/* set the back pointer to HW */\n \thw->port_info->hw = hw;\n \n \t/* Initialize port_info struct with switch configuration data */\n@@ -988,7 +988,7 @@ enum ice_status ice_reset(struct ice_hw *hw, enum ice_reset_req req)\n * @ice_rxq_ctx: pointer to the rxq context\n * @rxq_index: the index of the Rx queue\n *\n- * Copies rxq context from dense structure to hw register space\n+ * Copies rxq context from dense structure to HW register space\n */\n static enum ice_status\n ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)\n@@ -1001,7 +1001,7 @@ ice_copy_rxq_ctx_to_hw(struct ice_hw *hw, u8 *ice_rxq_ctx, u32 rxq_index)\n \tif (rxq_index > QRX_CTRL_MAX_INDEX)\n \t\treturn ICE_ERR_PARAM;\n \n-\t/* Copy each dword separately to hw */\n+\t/* Copy each dword separately to HW */\n \tfor (i = 0; i < ICE_RXQ_CTX_SIZE_DWORDS; i++) {\n \t\twr32(hw, QRX_CONTEXT(i, rxq_index),\n \t\t *((u32 *)(ice_rxq_ctx + (i * sizeof(u32)))));\n@@ -1045,7 +1045,7 @@ static const struct ice_ctx_ele ice_rlan_ctx_info[] = {\n * @rxq_index: the index of the Rx queue\n *\n * Converts rxq context from sparse to dense structure and then writes\n- * it to hw register space\n+ * it to HW register space\n */\n enum ice_status\n ice_write_rxq_ctx(struct ice_hw *hw, struct ice_rlan_ctx *rlan_ctx,\n@@ -1144,7 +1144,7 @@ ice_debug_cq(struct ice_hw *hw, u32 __maybe_unused mask, void *desc, void *buf,\n \n /**\n * ice_aq_send_cmd - send FW Admin Queue command to FW Admin Queue\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @desc: descriptor describing the command\n * @buf: buffer to use for indirect commands (NULL for direct commands)\n * @buf_size: size of buffer for indirect commands (0 for direct commands)\n@@ -1161,7 +1161,7 @@ ice_aq_send_cmd(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf,\n \n /**\n * ice_aq_get_fw_ver\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cd: pointer to command details structure or NULL\n *\n * Get the firmware version (0x0001) from the admin queue commands\n@@ -1195,7 +1195,7 @@ enum ice_status ice_aq_get_fw_ver(struct ice_hw *hw, struct ice_sq_cd *cd)\n \n /**\n * ice_aq_q_shutdown\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @unloading: is the driver unloading itself\n *\n * Tell the Firmware that we're shutting down the AdminQ and whether\n@@ -1218,8 +1218,8 @@ enum ice_status ice_aq_q_shutdown(struct ice_hw *hw, bool unloading)\n \n /**\n * ice_aq_req_res\n- * @hw: pointer to the hw struct\n- * @res: resource id\n+ * @hw: pointer to the HW struct\n+ * @res: resource ID\n * @access: access type\n * @sdp_number: resource number\n * @timeout: the maximum time in ms that the driver may hold the resource\n@@ -1304,8 +1304,8 @@ ice_aq_req_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n \n /**\n * ice_aq_release_res\n- * @hw: pointer to the hw struct\n- * @res: resource id\n+ * @hw: pointer to the HW struct\n+ * @res: resource ID\n * @sdp_number: resource number\n * @cd: pointer to command details structure or NULL\n *\n@@ -1331,7 +1331,7 @@ ice_aq_release_res(struct ice_hw *hw, enum ice_aq_res_ids res, u8 sdp_number,\n /**\n * ice_acquire_res\n * @hw: pointer to the HW structure\n- * @res: resource id\n+ * @res: resource ID\n * @access: access type (read or write)\n * @timeout: timeout in milliseconds\n *\n@@ -1393,7 +1393,7 @@ ice_acquire_res(struct ice_hw *hw, enum ice_aq_res_ids res,\n /**\n * ice_release_res\n * @hw: pointer to the HW structure\n- * @res: resource id\n+ * @res: resource ID\n *\n * This function will release a resource using the proper Admin Command.\n */\n@@ -1405,7 +1405,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)\n \tstatus = ice_aq_release_res(hw, res, 0, NULL);\n \n \t/* there are some rare cases when trying to release the resource\n-\t * results in an admin Q timeout, so handle them correctly\n+\t * results in an admin queue timeout, so handle them correctly\n \t */\n \twhile ((status == ICE_ERR_AQ_TIMEOUT) &&\n \t (total_delay < hw->adminq.sq_cmd_timeout)) {\n@@ -1417,7 +1417,7 @@ void ice_release_res(struct ice_hw *hw, enum ice_aq_res_ids res)\n \n /**\n * ice_get_num_per_func - determine number of resources per PF\n- * @hw: pointer to the hw structure\n+ * @hw: pointer to the HW structure\n * @max: value to be evenly split between each PF\n *\n * Determine the number of valid functions by going through the bitmap returned\n@@ -1440,7 +1440,7 @@ static u32 ice_get_num_per_func(struct ice_hw *hw, u32 max)\n \n /**\n * ice_parse_caps - parse function/device capabilities\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @buf: pointer to a buffer containing function/device capability records\n * @cap_count: number of capability records in the list\n * @opc: type of capabilities list to parse\n@@ -1582,7 +1582,7 @@ ice_parse_caps(struct ice_hw *hw, void *buf, u32 cap_count,\n \n /**\n * ice_aq_discover_caps - query function/device capabilities\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @buf: a virtual buffer to hold the capabilities\n * @buf_size: Size of the virtual buffer\n * @cap_count: cap count needed if AQ err==ENOMEM\n@@ -1681,7 +1681,7 @@ enum ice_status ice_get_caps(struct ice_hw *hw)\n \n /**\n * ice_aq_manage_mac_write - manage MAC address write command\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @mac_addr: MAC address to be written as LAA/LAA+WoL/Port address\n * @flags: flags to control write behavior\n * @cd: pointer to command details structure or NULL\n@@ -1709,7 +1709,7 @@ ice_aq_manage_mac_write(struct ice_hw *hw, const u8 *mac_addr, u8 flags,\n \n /**\n * ice_aq_clear_pxe_mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Tell the firmware that the driver is taking over from PXE (0x0110).\n */\n@@ -1725,7 +1725,7 @@ static enum ice_status ice_aq_clear_pxe_mode(struct ice_hw *hw)\n \n /**\n * ice_clear_pxe_mode - clear pxe operations mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Make sure all PXE mode settings are cleared, including things\n * like descriptor fetch/write-back mode.\n@@ -1741,10 +1741,10 @@ void ice_clear_pxe_mode(struct ice_hw *hw)\n * @phy_type_low: lower part of phy_type\n * @phy_type_high: higher part of phy_type\n *\n- * This helper function will convert an entry in phy type structure\n+ * This helper function will convert an entry in PHY type structure\n * [phy_type_low, phy_type_high] to its corresponding link speed.\n * Note: In the structure of [phy_type_low, phy_type_high], there should\n- * be one bit set, as this function will convert one phy type to its\n+ * be one bit set, as this function will convert one PHY type to its\n * speed.\n * If no bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned\n * If more than one bit gets set, ICE_LINK_SPEED_UNKNOWN will be returned\n@@ -1914,7 +1914,7 @@ ice_update_phy_type(u64 *phy_type_low, u64 *phy_type_high,\n \n /**\n * ice_aq_set_phy_cfg\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @lport: logical port number\n * @cfg: structure with PHY configuration data to be set\n * @cd: pointer to command details structure or NULL\n@@ -2029,7 +2029,7 @@ ice_set_fc(struct ice_port_info *pi, u8 *aq_failures, bool ena_auto_link_update)\n \tif (!pcaps)\n \t\treturn ICE_ERR_NO_MEMORY;\n \n-\t/* Get the current phy config */\n+\t/* Get the current PHY config */\n \tstatus = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,\n \t\t\t\t NULL);\n \tif (status) {\n@@ -2338,7 +2338,7 @@ ice_aq_set_rss_lut(struct ice_hw *hw, u16 vsi_handle, u8 lut_type,\n \n /**\n * __ice_aq_get_set_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_id: VSI FW index\n * @key: pointer to key info struct\n * @set: set true to set the key, false to get the key\n@@ -2373,7 +2373,7 @@ ice_status __ice_aq_get_set_rss_key(struct ice_hw *hw, u16 vsi_id,\n \n /**\n * ice_aq_get_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: software VSI handle\n * @key: pointer to key info struct\n *\n@@ -2392,7 +2392,7 @@ ice_aq_get_rss_key(struct ice_hw *hw, u16 vsi_handle,\n \n /**\n * ice_aq_set_rss_key\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: software VSI handle\n * @keys: pointer to key info struct\n *\n@@ -2517,7 +2517,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n \t\tbreak;\n \tcase ICE_VF_RESET:\n \t\tcmd->cmd_type = ICE_AQC_Q_DIS_CMD_VF_RESET;\n-\t\t/* In this case, FW expects vmvf_num to be absolute VF id */\n+\t\t/* In this case, FW expects vmvf_num to be absolute VF ID */\n \t\tcmd->vmvf_and_timeout |=\n \t\t\tcpu_to_le16((vmvf_num + hw->func_caps.vf_base_id) &\n \t\t\t\t ICE_AQC_Q_DIS_VMVF_NUM_M);\n@@ -2794,13 +2794,13 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n * ice_ena_vsi_txq\n * @pi: port information structure\n * @vsi_handle: software VSI handle\n- * @tc: tc number\n+ * @tc: TC number\n * @num_qgrps: Number of added queue groups\n * @buf: list of queue groups to be added\n * @buf_size: size of buffer for indirect command\n * @cd: pointer to command details structure or NULL\n *\n- * This function adds one lan q\n+ * This function adds one LAN queue\n */\n enum ice_status\n ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n@@ -2844,11 +2844,11 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n \t * Bit 5-6.\n \t * - Bit 7 is reserved.\n \t * Without setting the generic section as valid in valid_sections, the\n-\t * Admin Q command will fail with error code ICE_AQ_RC_EINVAL.\n+\t * Admin queue command will fail with error code ICE_AQ_RC_EINVAL.\n \t */\n \tbuf->txqs[0].info.valid_sections = ICE_AQC_ELEM_VALID_GENERIC;\n \n-\t/* add the lan q */\n+\t/* add the LAN queue */\n \tstatus = ice_aq_add_lan_txq(hw, num_qgrps, buf, buf_size, cd);\n \tif (status) {\n \t\tice_debug(hw, ICE_DBG_SCHED, \"enable Q %d failed %d\\n\",\n@@ -2860,7 +2860,7 @@ ice_ena_vsi_txq(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u8 num_qgrps,\n \tnode.node_teid = buf->txqs[0].q_teid;\n \tnode.data.elem_type = ICE_AQC_ELEM_TYPE_LEAF;\n \n-\t/* add a leaf node into schduler tree q layer */\n+\t/* add a leaf node into schduler tree queue layer */\n \tstatus = ice_sched_add_node(pi, hw->num_tx_sched_layers - 1, &node);\n \n ena_txq_exit:\n@@ -2930,7 +2930,7 @@ ice_dis_vsi_txq(struct ice_port_info *pi, u8 num_queues, u16 *q_ids,\n * @vsi_handle: software VSI handle\n * @tc_bitmap: TC bitmap\n * @maxqs: max queues array per TC\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n *\n * This function adds/updates the VSI queues per TC.\n */\n@@ -2965,13 +2965,13 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n }\n \n /**\n- * ice_cfg_vsi_lan - configure VSI lan queues\n+ * ice_cfg_vsi_lan - configure VSI LAN queues\n * @pi: port information structure\n * @vsi_handle: software VSI handle\n * @tc_bitmap: TC bitmap\n- * @max_lanqs: max lan queues array per TC\n+ * @max_lanqs: max LAN queues array per TC\n *\n- * This function adds/updates the VSI lan queues per TC.\n+ * This function adds/updates the VSI LAN queues per TC.\n */\n enum ice_status\n ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n@@ -2983,7 +2983,7 @@ ice_cfg_vsi_lan(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap,\n \n /**\n * ice_replay_pre_init - replay pre initialization\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Initializes required config data for VSI, FD, ACL, and RSS before replay.\n */\n@@ -3007,7 +3007,7 @@ static enum ice_status ice_replay_pre_init(struct ice_hw *hw)\n \n /**\n * ice_replay_vsi - replay VSI configuration\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: driver VSI handle\n *\n * Restore all VSI configuration after reset. It is required to call this\n@@ -3034,7 +3034,7 @@ enum ice_status ice_replay_vsi(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n * ice_replay_post - post replay configuration cleanup\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Post replay cleanup.\n */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c\nindex 2bf5e11f559a..cc8cb5fdcdc1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.c\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c\n@@ -51,7 +51,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw)\n \n /**\n * ice_check_sq_alive\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cq: pointer to the specific Control queue\n *\n * Returns true if Queue is enabled else false.\n@@ -287,7 +287,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n * @hw: pointer to the hardware structure\n * @cq: pointer to the specific Control queue\n *\n- * Configure base address and length registers for the receive (event q)\n+ * Configure base address and length registers for the receive (event queue)\n */\n static enum ice_status\n ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n@@ -751,7 +751,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \n /**\n * ice_sq_done - check if FW has processed the Admin Send Queue (ATQ)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cq: pointer to the specific Control queue\n *\n * Returns true if the firmware has processed all descriptors on the\n@@ -767,7 +767,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)\n \n /**\n * ice_sq_send_cmd - send command to Control Queue (ATQ)\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cq: pointer to the specific Control queue\n * @desc: prefilled descriptor describing the command (non DMA mem)\n * @buf: buffer to use for indirect commands (or NULL for direct commands)\n@@ -962,7 +962,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode)\n \n /**\n * ice_clean_rq_elem\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cq: pointer to the specific Control queue\n * @e: event info from the receive descriptor, includes any buffers\n * @pending: number of events that could be left to process\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex a76292988c18..1a0213a0796f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -811,7 +811,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,\n \n \tlink_info = &vsi->port_info->phy.link_info;\n \n-\t/* Initialize supported and advertised settings based on phy settings */\n+\t/* Initialize supported and advertised settings based on PHY settings */\n \tswitch (link_info->phy_type_low) {\n \tcase ICE_PHY_TYPE_LOW_100BASE_TX:\n \t\tethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);\n@@ -1140,7 +1140,7 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks,\n \t\t\t struct net_device __always_unused *netdev)\n {\n \t/* link is down and the driver needs to fall back on\n-\t * supported phy types to figure out what info to display\n+\t * supported PHY types to figure out what info to display\n \t */\n \tice_phy_type_to_ethtool(netdev, ks);\n \n@@ -1350,7 +1350,7 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks,\n \t} else {\n \t\t/* If autoneg is currently enabled */\n \t\tif (p->phy.link_info.an_info & ICE_AQ_AN_COMPLETED) {\n-\t\t\t/* If autoneg is supported 10GBASE_T is the only phy\n+\t\t\t/* If autoneg is supported 10GBASE_T is the only PHY\n \t\t\t * that can disable it, so otherwise return error\n \t\t\t */\n \t\t\tif (ethtool_link_ksettings_test_link_mode(ks,\n@@ -1400,7 +1400,7 @@ ice_set_link_ksettings(struct net_device *netdev,\n \tif (!p)\n \t\treturn -EOPNOTSUPP;\n \n-\t/* Check if this is lan vsi */\n+\t/* Check if this is LAN VSI */\n \tice_for_each_vsi(pf, idx)\n \t\tif (pf->vsi[idx]->type == ICE_VSI_PF) {\n \t\t\tif (np->vsi != pf->vsi[idx])\n@@ -1464,7 +1464,7 @@ ice_set_link_ksettings(struct net_device *netdev,\n \tif (!abilities)\n \t\treturn -ENOMEM;\n \n-\t/* Get the current phy config */\n+\t/* Get the current PHY config */\n \tstatus = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_SW_CFG, abilities,\n \t\t\t\t NULL);\n \tif (status) {\n@@ -1559,7 +1559,7 @@ ice_set_link_ksettings(struct net_device *netdev,\n }\n \n /**\n- * ice_get_rxnfc - command to get RX flow classification rules\n+ * ice_get_rxnfc - command to get Rx flow classification rules\n * @netdev: network interface device structure\n * @cmd: ethtool rxnfc command\n * @rule_locs: buffer to rturn Rx flow classification rules\n@@ -1833,7 +1833,7 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)\n \tif (!pcaps)\n \t\treturn;\n \n-\t/* Get current phy config */\n+\t/* Get current PHY config */\n \tstatus = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,\n \t\t\t\t NULL);\n \tif (status)\n@@ -2022,7 +2022,7 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)\n * @key: hash key\n * @hfunc: hash function\n *\n- * Returns -EINVAL if the table specifies an invalid queue id, otherwise\n+ * Returns -EINVAL if the table specifies an invalid queue ID, otherwise\n * returns 0 after programming the table.\n */\n static int\n@@ -2172,7 +2172,7 @@ enum ice_container_type {\n /**\n * ice_get_rc_coalesce - get ITR values for specific ring container\n * @ec: ethtool structure to fill with driver's coalesce settings\n- * @c_type: container type, RX or TX\n+ * @c_type: container type, Rx or Tx\n * @rc: ring container that the ITR values will come from\n *\n * Query the device for ice_ring_container specific ITR values. This is\n@@ -2274,7 +2274,7 @@ ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,\n \n /**\n * ice_set_rc_coalesce - set ITR values for specific ring container\n- * @c_type: container type, RX or TX\n+ * @c_type: container type, Rx or Tx\n * @ec: ethtool structure from user to update ITR settings\n * @rc: ring container that the ITR values will come from\n * @vsi: VSI associated to the ring container\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\nindex a8c3fe87d7aa..510a8c900e61 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\n+++ b/drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h\n@@ -20,7 +20,7 @@ union ice_32byte_rx_desc {\n \t\t\t} lo_dword;\n \t\t\tunion {\n \t\t\t\t__le32 rss; /* RSS Hash */\n-\t\t\t\t__le32 fd_id; /* Flow Director filter id */\n+\t\t\t\t__le32 fd_id; /* Flow Director filter ID */\n \t\t\t} hi_dword;\n \t\t} qword0;\n \t\tstruct {\n@@ -99,7 +99,7 @@ enum ice_rx_ptype_payload_layer {\n \tICE_RX_PTYPE_PAYLOAD_LAYER_PAY4\t= 3,\n };\n \n-/* RX Flex Descriptor\n+/* Rx Flex Descriptor\n * This descriptor is used instead of the legacy version descriptor when\n * ice_rlan_ctx.adv_desc is set\n */\n@@ -113,7 +113,7 @@ union ice_32b_rx_flex_desc {\n \t} read;\n \tstruct {\n \t\t/* Qword 0 */\n-\t\tu8 rxdid; /* descriptor builder profile id */\n+\t\tu8 rxdid; /* descriptor builder profile ID */\n \t\tu8 mir_id_umb_cast; /* mirror=[5:0], umb=[7:6] */\n \t\t__le16 ptype_flex_flags0; /* ptype=[9:0], ff0=[15:10] */\n \t\t__le16 pkt_len; /* [15:14] are reserved */\n@@ -149,7 +149,7 @@ union ice_32b_rx_flex_desc {\n \n /* Rx Flex Descriptor NIC Profile\n * This descriptor corresponds to RxDID 2 which contains\n- * metadata fields for RSS, flow id and timestamp info\n+ * metadata fields for RSS, flow ID and timestamp info\n */\n struct ice_32b_rx_flex_desc_nic {\n \t/* Qword 0 */\n@@ -208,7 +208,7 @@ enum ice_flex_rx_mdid {\n \tICE_RX_MDID_HASH_HIGH,\n };\n \n-/* RX/TX Flag64 packet flag bits */\n+/* Rx/Tx Flag64 packet flag bits */\n enum ice_flg64_bits {\n \tICE_FLG_PKT_DSI\t\t= 0,\n \tICE_FLG_EVLAN_x8100\t= 15,\n@@ -322,7 +322,7 @@ enum ice_rlan_ctx_rx_hsplit_1 {\n \tICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS\t= 2,\n };\n \n-/* TX Descriptor */\n+/* Tx Descriptor */\n struct ice_tx_desc {\n \t__le64 buf_addr; /* Address of descriptor's data buf */\n \t__le64 cmd_type_offset_bsz;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex f248d08425e2..bdda463ffe09 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -73,7 +73,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring)\n \t\tregval |= (rxdid << QRXFLXP_CNTXT_RXDID_IDX_S) &\n \t\t\tQRXFLXP_CNTXT_RXDID_IDX_M;\n \n-\t\t/* increasing context priority to pick up profile id;\n+\t\t/* increasing context priority to pick up profile ID;\n \t\t * default is 0x01; setting to 0x03 to ensure profile\n \t\t * is programming if prev context is of same priority\n \t\t */\n@@ -138,7 +138,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)\n \t\ttlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;\n \t\tbreak;\n \tcase ICE_VSI_VF:\n-\t\t/* Firmware expects vmvf_num to be absolute VF id */\n+\t\t/* Firmware expects vmvf_num to be absolute VF ID */\n \t\ttlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf_id;\n \t\ttlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;\n \t\tbreak;\n@@ -297,7 +297,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)\n /**\n * ice_vsi_set_num_qs - Set number of queues, descriptors and vectors for a VSI\n * @vsi: the VSI being configured\n- * @vf_id: Id of the VF being configured\n+ * @vf_id: ID of the VF being configured\n *\n * Return 0 on success and a negative value on error\n */\n@@ -487,7 +487,7 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data)\n * ice_vsi_alloc - Allocates the next available struct VSI in the PF\n * @pf: board private structure\n * @type: type of VSI\n- * @vf_id: Id of the VF being configured\n+ * @vf_id: ID of the VF being configured\n *\n * returns a pointer to a VSI on success, NULL on failure.\n */\n@@ -1471,12 +1471,12 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)\n }\n \n /**\n- * ice_add_mac_to_list - Add a mac address filter entry to the list\n+ * ice_add_mac_to_list - Add a MAC address filter entry to the list\n * @vsi: the VSI to be forwarded to\n * @add_list: pointer to the list which contains MAC filter entries\n * @macaddr: the MAC address to be added.\n *\n- * Adds mac address filter entry to the temp list\n+ * Adds MAC address filter entry to the temp list\n *\n * Returns 0 on success or ENOMEM on failure.\n */\n@@ -1578,7 +1578,7 @@ void ice_free_fltr_list(struct device *dev, struct list_head *h)\n /**\n * ice_vsi_add_vlan - Add VSI membership for given VLAN\n * @vsi: the VSI being configured\n- * @vid: VLAN id to be added\n+ * @vid: VLAN ID to be added\n */\n int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)\n {\n@@ -1616,7 +1616,7 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)\n /**\n * ice_vsi_kill_vlan - Remove VSI membership for a given VLAN\n * @vsi: the VSI being configured\n- * @vid: VLAN id to be removed\n+ * @vid: VLAN ID to be removed\n *\n * Returns 0 on success and negative on failure\n */\n@@ -2042,7 +2042,7 @@ int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)\n * ice_vsi_stop_tx_rings - Disable Tx rings\n * @vsi: the VSI being configured\n * @rst_src: reset source\n- * @rel_vmvf_num: Relative id of VF/VM\n+ * @rel_vmvf_num: Relative ID of VF/VM\n * @rings: Tx ring array to be stopped\n * @offset: offset within vsi->txq_map\n */\n@@ -2128,7 +2128,7 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n * ice_vsi_stop_lan_tx_rings - Disable LAN Tx rings\n * @vsi: the VSI being configured\n * @rst_src: reset source\n- * @rel_vmvf_num: Relative id of VF/VM\n+ * @rel_vmvf_num: Relative ID of VF/VM\n */\n int\n ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n@@ -2203,7 +2203,7 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc)\n * @pf: board private structure\n * @pi: pointer to the port_info instance\n * @type: VSI type\n- * @vf_id: defines VF id to which this VSI connects. This field is meant to be\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 *\n@@ -2245,7 +2245,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \t/* set RSS capabilities */\n \tice_vsi_set_rss_params(vsi);\n \n-\t/* set tc configuration */\n+\t/* set TC configuration */\n \tice_vsi_set_tc_cfg(vsi);\n \n \t/* create the VSI */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 7b3adc6f65e2..3bed4359886e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -113,14 +113,14 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)\n }\n \n /**\n- * ice_add_mac_to_sync_list - creates list of mac addresses to be synced\n+ * ice_add_mac_to_sync_list - creates list of MAC addresses to be synced\n * @netdev: the net device on which the sync is happening\n- * @addr: mac address to sync\n+ * @addr: MAC address to sync\n *\n * This is a callback function which is called by the in kernel device sync\n * functions (like __dev_uc_sync, __dev_mc_sync, etc). This function only\n * populates the tmp_sync_list, which is later used by ice_add_mac to add the\n- * mac filters from the hardware.\n+ * MAC filters from the hardware.\n */\n static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)\n {\n@@ -134,14 +134,14 @@ static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)\n }\n \n /**\n- * ice_add_mac_to_unsync_list - creates list of mac addresses to be unsynced\n+ * ice_add_mac_to_unsync_list - creates list of MAC addresses to be unsynced\n * @netdev: the net device on which the unsync is happening\n- * @addr: mac address to unsync\n+ * @addr: MAC address to unsync\n *\n * This is a callback function which is called by the in kernel device unsync\n * functions (like __dev_uc_unsync, __dev_mc_unsync, etc). This function only\n * populates the tmp_unsync_list, which is later used by ice_remove_mac to\n- * delete the mac filters from the hardware.\n+ * delete the MAC filters from the hardware.\n */\n static int ice_add_mac_to_unsync_list(struct net_device *netdev, const u8 *addr)\n {\n@@ -245,7 +245,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\tnetif_addr_unlock_bh(netdev);\n \t}\n \n-\t/* Remove mac addresses in the unsync list */\n+\t/* Remove MAC addresses in the unsync list */\n \tstatus = ice_remove_mac(hw, &vsi->tmp_unsync_list);\n \tice_free_fltr_list(dev, &vsi->tmp_unsync_list);\n \tif (status) {\n@@ -257,7 +257,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t}\n \t}\n \n-\t/* Add mac addresses in the sync list */\n+\t/* Add MAC addresses in the sync list */\n \tstatus = ice_add_mac(hw, &vsi->tmp_sync_list);\n \tice_free_fltr_list(dev, &vsi->tmp_sync_list);\n \t/* If filter is added successfully or already exists, do not go into\n@@ -266,7 +266,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t */\n \tif (status && status != ICE_ERR_ALREADY_EXISTS) {\n \t\tnetdev_err(netdev, \"Failed to add MAC filters\\n\");\n-\t\t/* If there is no more space for new umac filters, vsi\n+\t\t/* If there is no more space for new umac filters, VSI\n \t\t * should go into promiscuous mode. There should be some\n \t\t * space reserved for promiscuous filters.\n \t\t */\n@@ -317,7 +317,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t test_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags)) {\n \t\tclear_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags);\n \t\tif (vsi->current_netdev_flags & IFF_PROMISC) {\n-\t\t\t/* Apply TX filter rule to get traffic from VMs */\n+\t\t\t/* Apply Tx filter rule to get traffic from VMs */\n \t\t\tstatus = ice_cfg_dflt_vsi(hw, vsi->idx, true,\n \t\t\t\t\t\t ICE_FLTR_TX);\n \t\t\tif (status) {\n@@ -327,7 +327,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t\t\terr = -EIO;\n \t\t\t\tgoto out_promisc;\n \t\t\t}\n-\t\t\t/* Apply RX filter rule to get traffic from wire */\n+\t\t\t/* Apply Rx filter rule to get traffic from wire */\n \t\t\tstatus = ice_cfg_dflt_vsi(hw, vsi->idx, true,\n \t\t\t\t\t\t ICE_FLTR_RX);\n \t\t\tif (status) {\n@@ -338,7 +338,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t\t\tgoto out_promisc;\n \t\t\t}\n \t\t} else {\n-\t\t\t/* Clear TX filter rule to stop traffic from VMs */\n+\t\t\t/* Clear Tx filter rule to stop traffic from VMs */\n \t\t\tstatus = ice_cfg_dflt_vsi(hw, vsi->idx, false,\n \t\t\t\t\t\t ICE_FLTR_TX);\n \t\t\tif (status) {\n@@ -348,7 +348,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t\t\terr = -EIO;\n \t\t\t\tgoto out_promisc;\n \t\t\t}\n-\t\t\t/* Clear RX filter to remove traffic from wire */\n+\t\t\t/* Clear Rx filter to remove traffic from wire */\n \t\t\tstatus = ice_cfg_dflt_vsi(hw, vsi->idx, false,\n \t\t\t\t\t\t ICE_FLTR_RX);\n \t\t\tif (status) {\n@@ -608,9 +608,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)\n }\n \n /**\n- * ice_vsi_link_event - update the vsi's netdev\n- * @vsi: the vsi on which the link event occurred\n- * @link_up: whether or not the vsi needs to be set up or down\n+ * ice_vsi_link_event - update the VSI's netdev\n+ * @vsi: the VSI on which the link event occurred\n+ * @link_up: whether or not the VSI needs to be set up or down\n */\n static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)\n {\n@@ -1236,7 +1236,7 @@ static void ice_service_task(struct work_struct *work)\n \n /**\n * ice_set_ctrlq_len - helper function to set controlq length\n- * @hw: pointer to the hw instance\n+ * @hw: pointer to the HW instance\n */\n static void ice_set_ctrlq_len(struct ice_hw *hw)\n {\n@@ -1796,12 +1796,12 @@ ice_pf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)\n }\n \n /**\n- * ice_vlan_rx_add_vid - Add a vlan id filter to HW offload\n+ * ice_vlan_rx_add_vid - Add a VLAN ID filter to HW offload\n * @netdev: network interface to be adjusted\n * @proto: unused protocol\n- * @vid: vlan id to be added\n+ * @vid: VLAN ID to be added\n *\n- * net_device_ops implementation for adding vlan ids\n+ * net_device_ops implementation for adding VLAN IDs\n */\n static int\n ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,\n@@ -1827,7 +1827,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,\n \t\t\treturn ret;\n \t}\n \n-\t/* Add all VLAN ids including 0 to the switch filter. VLAN id 0 is\n+\t/* Add all VLAN IDs including 0 to the switch filter. VLAN ID 0 is\n \t * needed to continue allowing all untagged packets since VLAN prune\n \t * list is applied to all packets by the switch\n \t */\n@@ -1841,12 +1841,12 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,\n }\n \n /**\n- * ice_vlan_rx_kill_vid - Remove a vlan id filter from HW offload\n+ * ice_vlan_rx_kill_vid - Remove a VLAN ID filter from HW offload\n * @netdev: network interface to be adjusted\n * @proto: unused protocol\n- * @vid: vlan id to be removed\n+ * @vid: VLAN ID to be removed\n *\n- * net_device_ops implementation for removing vlan ids\n+ * net_device_ops implementation for removing VLAN IDs\n */\n static int\n ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,\n@@ -2622,7 +2622,7 @@ static void __exit ice_module_exit(void)\n module_exit(ice_module_exit);\n \n /**\n- * ice_set_mac_address - NDO callback to set mac address\n+ * ice_set_mac_address - NDO callback to set MAC address\n * @netdev: network interface device structure\n * @pi: pointer to an address structure\n *\n@@ -2659,14 +2659,14 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)\n \t\treturn -EBUSY;\n \t}\n \n-\t/* When we change the mac address we also have to change the mac address\n-\t * based filter rules that were created previously for the old mac\n+\t/* When we change the MAC address we also have to change the MAC address\n+\t * based filter rules that were created previously for the old MAC\n \t * address. So first, we remove the old filter rule using ice_remove_mac\n \t * and then create a new filter rule using ice_add_mac. Note that for\n-\t * both these operations, we first need to form a \"list\" of mac\n-\t * addresses (even though in this case, we have only 1 mac address to be\n+\t * both these operations, we first need to form a \"list\" of MAC\n+\t * addresses (even though in this case, we have only 1 MAC address to be\n \t * added/removed) and this done using ice_add_mac_to_list. Depending on\n-\t * the ensuing operation this \"list\" of mac addresses is either to be\n+\t * the ensuing operation this \"list\" of MAC addresses is either to be\n \t * added or removed from the filter.\n \t */\n \terr = ice_add_mac_to_list(vsi, &r_mac_list, netdev->dev_addr);\n@@ -2704,12 +2704,12 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)\n \t\treturn err;\n \t}\n \n-\t/* change the netdev's mac address */\n+\t/* change the netdev's MAC address */\n \tmemcpy(netdev->dev_addr, mac, netdev->addr_len);\n \tnetdev_dbg(vsi->netdev, \"updated mac address to %pM\\n\",\n \t\t netdev->dev_addr);\n \n-\t/* write new mac address to the firmware */\n+\t/* write new MAC address to the firmware */\n \tflags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;\n \tstatus = ice_aq_manage_mac_write(hw, mac, flags, NULL);\n \tif (status) {\n@@ -2751,7 +2751,7 @@ static void ice_set_rx_mode(struct net_device *netdev)\n * @tb: pointer to array of nladdr (unused)\n * @dev: the net device pointer\n * @addr: the MAC address entry being added\n- * @vid: VLAN id\n+ * @vid: VLAN ID\n * @flags: instructions from stack about fdb operation\n * @extack: netlink extended ack\n */\n@@ -2791,7 +2791,7 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],\n * @tb: pointer to array of nladdr (unused)\n * @dev: the net device pointer\n * @addr: the MAC address entry being added\n- * @vid: VLAN id\n+ * @vid: VLAN ID\n */\n static int\n ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],\n@@ -2850,8 +2850,8 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)\n }\n \n /**\n- * ice_vsi_vlan_setup - Setup vlan offload properties on a VSI\n- * @vsi: VSI to setup vlan properties for\n+ * ice_vsi_vlan_setup - Setup VLAN offload properties on a VSI\n+ * @vsi: VSI to setup VLAN properties for\n */\n static int ice_vsi_vlan_setup(struct ice_vsi *vsi)\n {\n@@ -4038,7 +4038,7 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)\n /**\n * ice_bridge_getlink - Get the hardware bridge mode\n * @skb: skb buff\n- * @pid: process id\n+ * @pid: process ID\n * @seq: RTNL message seq\n * @dev: the netdev being configured\n * @filter_mask: filter mask passed in\ndiff --git a/drivers/net/ethernet/intel/ice/ice_nvm.c b/drivers/net/ethernet/intel/ice/ice_nvm.c\nindex 413fdbbcc4d0..62571d33d0d6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_nvm.c\n+++ b/drivers/net/ethernet/intel/ice/ice_nvm.c\n@@ -5,7 +5,7 @@\n \n /**\n * ice_aq_read_nvm\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @module_typeid: module pointer location in words from the NVM beginning\n * @offset: byte offset from the module beginning\n * @length: length of the section to be read (in bytes from the offset)\n@@ -235,7 +235,7 @@ ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)\n \n /**\n * ice_init_nvm - initializes NVM setting\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * This function reads and populates NVM settings such as Shadow RAM size,\n * max_timeout, and blank_nvm_mode\n@@ -248,7 +248,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)\n \tu32 fla, gens_stat;\n \tu8 sr_size;\n \n-\t/* The SR size is stored regardless of the nvm programming mode\n+\t/* The SR size is stored regardless of the NVM programming mode\n \t * as the blank mode may be used in the factory line.\n \t */\n \tgens_stat = rd32(hw, GLNVM_GENS);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_sched.c b/drivers/net/ethernet/intel/ice/ice_sched.c\nindex e0218f4c8f0b..3d1c941a938e 100644\n--- a/drivers/net/ethernet/intel/ice/ice_sched.c\n+++ b/drivers/net/ethernet/intel/ice/ice_sched.c\n@@ -43,9 +43,9 @@ ice_sched_add_root_node(struct ice_port_info *pi,\n /**\n * ice_sched_find_node_by_teid - Find the Tx scheduler node in SW DB\n * @start_node: pointer to the starting ice_sched_node struct in a sub-tree\n- * @teid: node teid to search\n+ * @teid: node TEID to search\n *\n- * This function searches for a node matching the teid in the scheduling tree\n+ * This function searches for a node matching the TEID in the scheduling tree\n * from the SW DB. The search is recursive and is restricted by the number of\n * layers it has searched through; stopping at the max supported layer.\n *\n@@ -66,7 +66,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)\n \t start_node->info.data.elem_type == ICE_AQC_ELEM_TYPE_LEAF)\n \t\treturn NULL;\n \n-\t/* Check if teid matches to any of the children nodes */\n+\t/* Check if TEID matches to any of the children nodes */\n \tfor (i = 0; i < start_node->num_children; i++)\n \t\tif (ICE_TXSCHED_GET_NODE_TEID(start_node->children[i]) == teid)\n \t\t\treturn start_node->children[i];\n@@ -86,7 +86,7 @@ ice_sched_find_node_by_teid(struct ice_sched_node *start_node, u32 teid)\n \n /**\n * ice_aqc_send_sched_elem_cmd - send scheduling elements cmd\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @cmd_opc: cmd opcode\n * @elems_req: number of elements to request\n * @buf: pointer to buffer\n@@ -118,7 +118,7 @@ ice_aqc_send_sched_elem_cmd(struct ice_hw *hw, enum ice_adminq_opc cmd_opc,\n \n /**\n * ice_aq_query_sched_elems - query scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @elems_req: number of elements to query\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -138,9 +138,9 @@ ice_aq_query_sched_elems(struct ice_hw *hw, u16 elems_req,\n }\n \n /**\n- * ice_sched_query_elem - query element information from hw\n- * @hw: pointer to the hw struct\n- * @node_teid: node teid to be queried\n+ * ice_sched_query_elem - query element information from HW\n+ * @hw: pointer to the HW struct\n+ * @node_teid: node TEID to be queried\n * @buf: buffer to element information\n *\n * This function queries HW element information\n@@ -226,7 +226,7 @@ ice_sched_add_node(struct ice_port_info *pi, u8 layer,\n \n /**\n * ice_aq_delete_sched_elems - delete scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @grps_req: number of groups to delete\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -246,13 +246,13 @@ ice_aq_delete_sched_elems(struct ice_hw *hw, u16 grps_req,\n }\n \n /**\n- * ice_sched_remove_elems - remove nodes from hw\n- * @hw: pointer to the hw struct\n+ * ice_sched_remove_elems - remove nodes from HW\n+ * @hw: pointer to the HW struct\n * @parent: pointer to the parent node\n * @num_nodes: number of nodes\n * @node_teids: array of node teids to be deleted\n *\n- * This function remove nodes from hw\n+ * This function remove nodes from HW\n */\n static enum ice_status\n ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,\n@@ -285,7 +285,7 @@ ice_sched_remove_elems(struct ice_hw *hw, struct ice_sched_node *parent,\n \n /**\n * ice_sched_get_first_node - get the first node of the given layer\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @parent: pointer the base node of the subtree\n * @layer: layer number\n *\n@@ -406,7 +406,7 @@ void ice_free_sched_node(struct ice_port_info *pi, struct ice_sched_node *node)\n \n /**\n * ice_aq_get_dflt_topo - gets default scheduler topology\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @lport: logical port number\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -436,7 +436,7 @@ ice_aq_get_dflt_topo(struct ice_hw *hw, u8 lport,\n \n /**\n * ice_aq_add_sched_elems - adds scheduling element\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @grps_req: the number of groups that are requested to be added\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -457,7 +457,7 @@ ice_aq_add_sched_elems(struct ice_hw *hw, u16 grps_req,\n \n /**\n * ice_aq_suspend_sched_elems - suspend scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @elems_req: number of elements to suspend\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -478,7 +478,7 @@ ice_aq_suspend_sched_elems(struct ice_hw *hw, u16 elems_req,\n \n /**\n * ice_aq_resume_sched_elems - resume scheduler elements\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @elems_req: number of elements to resume\n * @buf: pointer to buffer\n * @buf_size: buffer size in bytes\n@@ -499,7 +499,7 @@ ice_aq_resume_sched_elems(struct ice_hw *hw, u16 elems_req,\n \n /**\n * ice_aq_query_sched_res - query scheduler resource\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @buf_size: buffer size in bytes\n * @buf: pointer to buffer\n * @cd: pointer to command details structure or NULL\n@@ -518,13 +518,13 @@ ice_aq_query_sched_res(struct ice_hw *hw, u16 buf_size,\n }\n \n /**\n- * ice_sched_suspend_resume_elems - suspend or resume hw nodes\n- * @hw: pointer to the hw struct\n+ * ice_sched_suspend_resume_elems - suspend or resume HW nodes\n+ * @hw: pointer to the HW struct\n * @num_nodes: number of nodes\n * @node_teids: array of node teids to be suspended or resumed\n * @suspend: true means suspend / false means resume\n *\n- * This function suspends or resumes hw nodes\n+ * This function suspends or resumes HW nodes\n */\n static enum ice_status\n ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,\n@@ -558,10 +558,10 @@ ice_sched_suspend_resume_elems(struct ice_hw *hw, u8 num_nodes, u32 *node_teids,\n }\n \n /**\n- * ice_sched_clear_agg - clears the agg related information\n+ * ice_sched_clear_agg - clears the aggregator related information\n * @hw: pointer to the hardware structure\n *\n- * This function removes agg list and free up agg related memory\n+ * This function removes aggregator list and free up aggregator related memory\n * previously allocated.\n */\n void ice_sched_clear_agg(struct ice_hw *hw)\n@@ -619,7 +619,7 @@ void ice_sched_clear_port(struct ice_port_info *pi)\n \n /**\n * ice_sched_cleanup_all - cleanup scheduler elements from SW DB for all ports\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Cleanup scheduling elements from SW DB for all the ports\n */\n@@ -643,16 +643,16 @@ void ice_sched_cleanup_all(struct ice_hw *hw)\n }\n \n /**\n- * ice_sched_add_elems - add nodes to hw and SW DB\n+ * ice_sched_add_elems - add nodes to HW and SW DB\n * @pi: port information structure\n * @tc_node: pointer to the branch node\n * @parent: pointer to the parent node\n * @layer: layer number to add nodes\n * @num_nodes: number of nodes\n * @num_nodes_added: pointer to num nodes added\n- * @first_node_teid: if new nodes are added then return the teid of first node\n+ * @first_node_teid: if new nodes are added then return the TEID of first node\n *\n- * This function add nodes to hw as well as to SW DB for a given layer\n+ * This function add nodes to HW as well as to SW DB for a given layer\n */\n static enum ice_status\n ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,\n@@ -746,7 +746,7 @@ ice_sched_add_elems(struct ice_port_info *pi, struct ice_sched_node *tc_node,\n * @parent: pointer to parent node\n * @layer: layer number to add nodes\n * @num_nodes: number of nodes to be added\n- * @first_node_teid: pointer to the first node teid\n+ * @first_node_teid: pointer to the first node TEID\n * @num_nodes_added: pointer to number of nodes added\n *\n * This function add nodes to a given layer.\n@@ -798,7 +798,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,\n \n \t\t\t*num_nodes_added += num_added;\n \t\t}\n-\t\t/* Don't modify the first node teid memory if the first node was\n+\t\t/* Don't modify the first node TEID memory if the first node was\n \t\t * added already in the above call. Instead send some temp\n \t\t * memory for all other recursive calls.\n \t\t */\n@@ -830,7 +830,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,\n \n /**\n * ice_sched_get_qgrp_layer - get the current queue group layer number\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * This function returns the current queue group layer number\n */\n@@ -842,7 +842,7 @@ static u8 ice_sched_get_qgrp_layer(struct ice_hw *hw)\n \n /**\n * ice_sched_get_vsi_layer - get the current VSI layer number\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * This function returns the current VSI layer number\n */\n@@ -853,7 +853,7 @@ static u8 ice_sched_get_vsi_layer(struct ice_hw *hw)\n \t * 7 4\n \t * 5 or less sw_entry_point_layer\n \t */\n-\t/* calculate the vsi layer based on number of layers. */\n+\t/* calculate the VSI layer based on number of layers. */\n \tif (hw->num_tx_sched_layers > ICE_VSI_LAYER_OFFSET + 1) {\n \t\tu8 layer = hw->num_tx_sched_layers - ICE_VSI_LAYER_OFFSET;\n \n@@ -971,7 +971,7 @@ enum ice_status ice_sched_init_port(struct ice_port_info *pi)\n \t\tgoto err_init_port;\n \t}\n \n-\t/* If the last node is a leaf node then the index of the Q group\n+\t/* If the last node is a leaf node then the index of the queue group\n \t * layer is two less than the number of elements.\n \t */\n \tif (num_elems > 2 && buf[0].generic[num_elems - 1].data.elem_type ==\n@@ -1080,7 +1080,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)\n \n /**\n * ice_sched_find_node_in_subtree - Find node in part of base node subtree\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @base: pointer to the base node\n * @node: pointer to the node to search\n *\n@@ -1112,13 +1112,13 @@ ice_sched_find_node_in_subtree(struct ice_hw *hw, struct ice_sched_node *base,\n }\n \n /**\n- * ice_sched_get_free_qparent - Get a free lan or rdma q group node\n+ * ice_sched_get_free_qparent - Get a free LAN or RDMA queue group node\n * @pi: port information structure\n * @vsi_handle: software VSI handle\n * @tc: branch number\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n *\n- * This function retrieves a free lan or rdma q group node\n+ * This function retrieves a free LAN or RDMA queue group node\n */\n struct ice_sched_node *\n ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n@@ -1136,11 +1136,11 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n \tif (!vsi_ctx)\n \t\treturn NULL;\n \tvsi_node = vsi_ctx->sched.vsi_node[tc];\n-\t/* validate invalid VSI id */\n+\t/* validate invalid VSI ID */\n \tif (!vsi_node)\n \t\tgoto lan_q_exit;\n \n-\t/* get the first q group node from VSI sub-tree */\n+\t/* get the first queue group node from VSI sub-tree */\n \tqgrp_node = ice_sched_get_first_node(pi->hw, vsi_node, qgrp_layer);\n \twhile (qgrp_node) {\n \t\t/* make sure the qgroup node is part of the VSI subtree */\n@@ -1156,12 +1156,12 @@ ice_sched_get_free_qparent(struct ice_port_info *pi, u16 vsi_handle, u8 tc,\n }\n \n /**\n- * ice_sched_get_vsi_node - Get a VSI node based on VSI id\n- * @hw: pointer to the hw struct\n+ * ice_sched_get_vsi_node - Get a VSI node based on VSI ID\n+ * @hw: pointer to the HW struct\n * @tc_node: pointer to the TC node\n * @vsi_handle: software VSI handle\n *\n- * This function retrieves a VSI node for a given VSI id from a given\n+ * This function retrieves a VSI node for a given VSI ID from a given\n * TC branch\n */\n static struct ice_sched_node *\n@@ -1186,7 +1186,7 @@ ice_sched_get_vsi_node(struct ice_hw *hw, struct ice_sched_node *tc_node,\n \n /**\n * ice_sched_calc_vsi_child_nodes - calculate number of VSI child nodes\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @num_qs: number of queues\n * @num_nodes: num nodes array\n *\n@@ -1202,7 +1202,7 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)\n \tqgl = ice_sched_get_qgrp_layer(hw);\n \tvsil = ice_sched_get_vsi_layer(hw);\n \n-\t/* calculate num nodes from q group to VSI layer */\n+\t/* calculate num nodes from queue group to VSI layer */\n \tfor (i = qgl; i > vsil; i--) {\n \t\t/* round to the next integer if there is a remainder */\n \t\tnum = DIV_ROUND_UP(num, hw->max_children[i]);\n@@ -1218,10 +1218,10 @@ ice_sched_calc_vsi_child_nodes(struct ice_hw *hw, u16 num_qs, u16 *num_nodes)\n * @vsi_handle: software VSI handle\n * @tc_node: pointer to the TC node\n * @num_nodes: pointer to the num nodes that needs to be added per layer\n- * @owner: node owner (lan or rdma)\n+ * @owner: node owner (LAN or RDMA)\n *\n * This function adds the VSI child nodes to tree. It gets called for\n- * lan and rdma separately.\n+ * LAN and RDMA separately.\n */\n static enum ice_status\n ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n@@ -1270,7 +1270,7 @@ ice_sched_add_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n \n /**\n * ice_sched_calc_vsi_support_nodes - calculate number of VSI support nodes\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @tc_node: pointer to TC node\n * @num_nodes: pointer to num nodes array\n *\n@@ -1389,7 +1389,7 @@ ice_sched_add_vsi_to_topo(struct ice_port_info *pi, u16 vsi_handle, u8 tc)\n \t/* calculate number of supported nodes needed for this VSI */\n \tice_sched_calc_vsi_support_nodes(hw, tc_node, num_nodes);\n \n-\t/* add vsi supported nodes to tc subtree */\n+\t/* add VSI supported nodes to TC subtree */\n \treturn ice_sched_add_vsi_support_nodes(pi, vsi_handle, tc_node,\n \t\t\t\t\t num_nodes);\n }\n@@ -1460,7 +1460,7 @@ ice_sched_update_vsi_child_nodes(struct ice_port_info *pi, u16 vsi_handle,\n * @vsi_handle: software VSI handle\n * @tc: TC number\n * @maxqs: max number of queues\n- * @owner: lan or rdma\n+ * @owner: LAN or RDMA\n * @enable: TC enabled or disabled\n *\n * This function adds/updates VSI nodes based on the number of queues. If TC is\n@@ -1485,7 +1485,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,\n \t\treturn ICE_ERR_PARAM;\n \tvsi_node = ice_sched_get_vsi_node(hw, tc_node, vsi_handle);\n \n-\t/* suspend the VSI if tc is not enabled */\n+\t/* suspend the VSI if TC is not enabled */\n \tif (!enable) {\n \t\tif (vsi_node && vsi_node->in_use) {\n \t\t\tu32 teid = le32_to_cpu(vsi_node->info.node_teid);\n@@ -1536,7 +1536,7 @@ ice_sched_cfg_vsi(struct ice_port_info *pi, u16 vsi_handle, u8 tc, u16 maxqs,\n }\n \n /**\n- * ice_sched_rm_agg_vsi_entry - remove agg related VSI info entry\n+ * ice_sched_rm_agg_vsi_entry - remove aggregator related VSI info entry\n * @pi: port information structure\n * @vsi_handle: software VSI handle\n *\n@@ -1641,7 +1641,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner)\n \t\t\tice_free_sched_node(pi, vsi_node);\n \t\t\tvsi_ctx->sched.vsi_node[i] = NULL;\n \n-\t\t\t/* clean up agg related vsi info if any */\n+\t\t\t/* clean up aggregator related VSI info if any */\n \t\t\tice_sched_rm_agg_vsi_info(pi, vsi_handle);\n \t\t}\n \t\tif (owner == ICE_SCHED_NODE_OWNER_LAN)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex e52cf73b2a55..87d87ae3f551 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\n@@ -19,7 +19,7 @@\n * byte 6 = 0x2: to identify it as locally administered SA MAC\n * byte 12 = 0x81 & byte 13 = 0x00:\n *\tIn case of VLAN filter first two bytes defines ether type (0x8100)\n- *\tand remaining two bytes are placeholder for programming a given VLAN id\n+ *\tand remaining two bytes are placeholder for programming a given VLAN ID\n *\tIn case of Ether type filter it is treated as header without VLAN tag\n *\tand byte 12 and 13 is used to program a given Ether type instead\n */\n@@ -51,7 +51,7 @@ static const u8 dummy_eth_header[DUMMY_ETH_HDR_LEN] = { 0x2, 0, 0, 0, 0, 0,\n \n /**\n * ice_aq_alloc_free_res - command to allocate/free resources\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @num_entries: number of resource entries in buffer\n * @buf: Indirect buffer to hold data parameters and response\n * @buf_size: size of buffer for indirect commands\n@@ -87,7 +87,7 @@ ice_aq_alloc_free_res(struct ice_hw *hw, u16 num_entries,\n \n /**\n * ice_init_def_sw_recp - initialize the recipe book keeping tables\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Allocate memory for the entire recipe table and initialize the structures/\n * entries corresponding to basic recipes.\n@@ -163,7 +163,7 @@ ice_aq_get_sw_cfg(struct ice_hw *hw, struct ice_aqc_get_sw_cfg_resp *buf,\n \n /**\n * ice_aq_add_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_ctx: pointer to a VSI context struct\n * @cd: pointer to command details structure or NULL\n *\n@@ -206,7 +206,7 @@ ice_aq_add_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_aq_free_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_ctx: pointer to a VSI context struct\n * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources\n * @cd: pointer to command details structure or NULL\n@@ -242,7 +242,7 @@ ice_aq_free_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_aq_update_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_ctx: pointer to a VSI context struct\n * @cd: pointer to command details structure or NULL\n *\n@@ -279,7 +279,7 @@ ice_aq_update_vsi(struct ice_hw *hw, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_is_vsi_valid - check whether the VSI is valid or not\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n *\n * check whether the VSI is valid or not\n@@ -290,11 +290,11 @@ bool ice_is_vsi_valid(struct ice_hw *hw, u16 vsi_handle)\n }\n \n /**\n- * ice_get_hw_vsi_num - return the hw VSI number\n- * @hw: pointer to the hw struct\n+ * ice_get_hw_vsi_num - return the HW VSI number\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n *\n- * return the hw VSI number\n+ * return the HW VSI number\n * Caution: call this function only if VSI is valid (ice_is_vsi_valid)\n */\n u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)\n@@ -304,7 +304,7 @@ u16 ice_get_hw_vsi_num(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n * ice_get_vsi_ctx - return the VSI context entry for a given VSI handle\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n *\n * return the VSI context entry for a given VSI handle\n@@ -316,7 +316,7 @@ struct ice_vsi_ctx *ice_get_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n * ice_save_vsi_ctx - save the VSI context for a given VSI handle\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n * @vsi: VSI context pointer\n *\n@@ -330,7 +330,7 @@ ice_save_vsi_ctx(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi)\n \n /**\n * ice_clear_vsi_ctx - clear the VSI context entry\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n *\n * clear the VSI context entry\n@@ -348,7 +348,7 @@ static void ice_clear_vsi_ctx(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n * ice_clear_all_vsi_ctx - clear all the VSI context entries\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n */\n void ice_clear_all_vsi_ctx(struct ice_hw *hw)\n {\n@@ -360,7 +360,7 @@ void ice_clear_all_vsi_ctx(struct ice_hw *hw)\n \n /**\n * ice_add_vsi - add VSI context to the hardware and VSI handle list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: unique VSI handle provided by drivers\n * @vsi_ctx: pointer to a VSI context struct\n * @cd: pointer to command details structure or NULL\n@@ -383,7 +383,7 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \t\treturn status;\n \ttmp_vsi_ctx = ice_get_vsi_ctx(hw, vsi_handle);\n \tif (!tmp_vsi_ctx) {\n-\t\t/* Create a new vsi context */\n+\t\t/* Create a new VSI context */\n \t\ttmp_vsi_ctx = devm_kzalloc(ice_hw_to_dev(hw),\n \t\t\t\t\t sizeof(*tmp_vsi_ctx), GFP_KERNEL);\n \t\tif (!tmp_vsi_ctx) {\n@@ -403,7 +403,7 @@ ice_add_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_free_vsi- free VSI context from hardware and VSI handle list\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: unique VSI handle\n * @vsi_ctx: pointer to a VSI context struct\n * @keep_vsi_alloc: keep VSI allocation as part of this PF's resources\n@@ -428,7 +428,7 @@ ice_free_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_update_vsi\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: unique VSI handle\n * @vsi_ctx: pointer to a VSI context struct\n * @cd: pointer to command details structure or NULL\n@@ -447,8 +447,8 @@ ice_update_vsi(struct ice_hw *hw, u16 vsi_handle, struct ice_vsi_ctx *vsi_ctx,\n \n /**\n * ice_aq_alloc_free_vsi_list\n- * @hw: pointer to the hw struct\n- * @vsi_list_id: VSI list id returned or used for lookup\n+ * @hw: pointer to the HW struct\n+ * @vsi_list_id: VSI list ID returned or used for lookup\n * @lkup_type: switch rule filter lookup type\n * @opc: switch rules population command type - pass in the command opcode\n *\n@@ -504,7 +504,7 @@ ice_aq_alloc_free_vsi_list(struct ice_hw *hw, u16 *vsi_list_id,\n \n /**\n * ice_aq_sw_rules - add/update/remove switch rules\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @rule_list: pointer to switch rule population list\n * @rule_list_sz: total size of the rule list in bytes\n * @num_rules: number of switch rules in the rule_list\n@@ -653,7 +653,7 @@ static void ice_fill_sw_info(struct ice_hw *hw, struct ice_fltr_info *fi)\n \t\t * 1. The switch is a VEB AND\n \t\t * 2\n \t\t * 2.1 The lookup is a directional lookup like ethertype,\n-\t\t * promiscuous, ethertype-mac, promiscuous-vlan\n+\t\t * promiscuous, ethertype-MAC, promiscuous-VLAN\n \t\t * and default-port OR\n \t\t * 2.2 The lookup is VLAN, OR\n \t\t * 2.3 The lookup is MAC with mcast or bcast addr for MAC, OR\n@@ -821,7 +821,7 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info,\n * @hw: pointer to the hardware structure\n * @m_ent: the management entry for which sw marker needs to be added\n * @sw_marker: sw marker to tag the Rx descriptor with\n- * @l_id: large action resource id\n+ * @l_id: large action resource ID\n *\n * Create a large action to hold software marker and update the switch rule\n * entry pointed by m_ent with newly created large action\n@@ -833,8 +833,8 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n \tstruct ice_aqc_sw_rules_elem *lg_act, *rx_tx;\n \t/* For software marker we need 3 large actions\n \t * 1. FWD action: FWD TO VSI or VSI LIST\n-\t * 2. GENERIC VALUE action to hold the profile id\n-\t * 3. GENERIC VALUE action to hold the software marker id\n+\t * 2. GENERIC VALUE action to hold the profile ID\n+\t * 3. GENERIC VALUE action to hold the software marker ID\n \t */\n \tconst u16 num_lg_acts = 3;\n \tenum ice_status status;\n@@ -897,13 +897,13 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n \tice_fill_sw_rule(hw, &m_ent->fltr_info, rx_tx,\n \t\t\t ice_aqc_opc_update_sw_rules);\n \n-\t/* Update the action to point to the large action id */\n+\t/* Update the action to point to the large action ID */\n \trx_tx->pdata.lkup_tx_rx.act =\n \t\tcpu_to_le32(ICE_SINGLE_ACT_PTR |\n \t\t\t ((l_id << ICE_SINGLE_ACT_PTR_VAL_S) &\n \t\t\t ICE_SINGLE_ACT_PTR_VAL_M));\n \n-\t/* Use the filter rule id of the previously created rule with single\n+\t/* Use the filter rule ID of the previously created rule with single\n \t * act. Once the update happens, hardware will treat this as large\n \t * action\n \t */\n@@ -926,10 +926,10 @@ ice_add_marker_act(struct ice_hw *hw, struct ice_fltr_mgmt_list_entry *m_ent,\n * @hw: pointer to the hardware structure\n * @vsi_handle_arr: array of VSI handles to set in the VSI mapping\n * @num_vsi: number of VSI handles in the array\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n *\n- * Helper function to create a new entry of VSI list id to VSI mapping\n- * using the given VSI list id\n+ * Helper function to create a new entry of VSI list ID to VSI mapping\n+ * using the given VSI list ID\n */\n static struct ice_vsi_list_map_info *\n ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n@@ -957,13 +957,13 @@ ice_create_vsi_list_map(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n * @hw: pointer to the hardware structure\n * @vsi_handle_arr: array of VSI handles to form a VSI list\n * @num_vsi: number of VSI handles in the array\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n * @remove: Boolean value to indicate if this is a remove action\n * @opc: switch rules population command type - pass in the command opcode\n * @lkup_type: lookup type of the filter\n *\n * Call AQ command to add a new switch rule or update existing switch rule\n- * using the given VSI list id\n+ * using the given VSI list ID\n */\n static enum ice_status\n ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n@@ -1020,7 +1020,7 @@ ice_update_vsi_list_rule(struct ice_hw *hw, u16 *vsi_handle_arr, u16 num_vsi,\n \n /**\n * ice_create_vsi_list_rule - Creates and populates a VSI list rule\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle_arr: array of VSI handles to form a VSI list\n * @num_vsi: number of VSI handles in the array\n * @vsi_list_id: stores the ID of the VSI list to be created\n@@ -1114,7 +1114,7 @@ ice_create_pkt_fwd_rule(struct ice_hw *hw,\n * @f_info: filter information for switch rule\n *\n * Call AQ command to update a previously created switch rule with a\n- * VSI list id\n+ * VSI list ID\n */\n static enum ice_status\n ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)\n@@ -1141,7 +1141,7 @@ ice_update_pkt_fwd_rule(struct ice_hw *hw, struct ice_fltr_info *f_info)\n \n /**\n * ice_update_sw_rule_bridge_mode\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Updates unicast switch filter rules based on VEB/VEPA mode\n */\n@@ -1196,7 +1196,7 @@ enum ice_status ice_update_sw_rule_bridge_mode(struct ice_hw *hw)\n *\t\tAllocate a new VSI list and add two VSIs\n *\t\tto this list using switch rule command\n *\t\tUpdate the previously created switch rule with the\n- *\t\tnewly created VSI list id\n+ *\t\tnewly created VSI list ID\n *\tif a VSI list was previously created\n *\t\tAdd the new VSI to the previously created VSI list set\n *\t\tusing the update switch rule command\n@@ -1277,7 +1277,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,\n \t\t\treturn 0;\n \n \t\t/* Update the previously created VSI list set with\n-\t\t * the new VSI id passed in\n+\t\t * the new VSI ID passed in\n \t\t */\n \t\tvsi_list_id = cur_fltr->fwd_id.vsi_list_id;\n \t\topcode = ice_aqc_opc_update_sw_rules;\n@@ -1285,7 +1285,7 @@ ice_add_update_vsi_list(struct ice_hw *hw,\n \t\tstatus = ice_update_vsi_list_rule(hw, &vsi_handle, 1,\n \t\t\t\t\t\t vsi_list_id, false, opcode,\n \t\t\t\t\t\t new_fltr->lkup_type);\n-\t\t/* update VSI list mapping info with new VSI id */\n+\t\t/* update VSI list mapping info with new VSI ID */\n \t\tif (!status)\n \t\t\tset_bit(vsi_handle, m_entry->vsi_list_info->vsi_map);\n \t}\n@@ -1327,7 +1327,7 @@ ice_find_rule_entry(struct ice_hw *hw, u8 recp_id, struct ice_fltr_info *f_info)\n * @hw: pointer to the hardware structure\n * @recp_id: lookup type for which VSI lists needs to be searched\n * @vsi_handle: VSI handle to be found in VSI list\n- * @vsi_list_id: VSI list id found containing vsi_handle\n+ * @vsi_list_id: VSI list ID found containing vsi_handle\n *\n * Helper function to search a VSI list with single entry containing given VSI\n * handle element. This can be extended further to search VSI list with more\n@@ -1358,7 +1358,7 @@ ice_find_vsi_list_entry(struct ice_hw *hw, u8 recp_id, u16 vsi_handle,\n /**\n * ice_add_rule_internal - add rule for a given lookup type\n * @hw: pointer to the hardware structure\n- * @recp_id: lookup type (recipe id) for which rule has to be added\n+ * @recp_id: lookup type (recipe ID) for which rule has to be added\n * @f_entry: structure containing MAC forwarding information\n *\n * Adds or updates the rule lists for a given recipe\n@@ -1403,7 +1403,7 @@ ice_add_rule_internal(struct ice_hw *hw, u8 recp_id,\n /**\n * ice_remove_vsi_list_rule\n * @hw: pointer to the hardware structure\n- * @vsi_list_id: VSI list id generated as part of allocate resource\n+ * @vsi_list_id: VSI list ID generated as part of allocate resource\n * @lkup_type: switch rule filter lookup type\n *\n * The VSI list should be emptied before this function is called to remove the\n@@ -1528,7 +1528,7 @@ ice_rem_update_vsi_list(struct ice_hw *hw, u16 vsi_handle,\n /**\n * ice_remove_rule_internal - Remove a filter rule of a given type\n * @hw: pointer to the hardware structure\n- * @recp_id: recipe id for which the rule needs to removed\n+ * @recp_id: recipe ID for which the rule needs to removed\n * @f_entry: rule entry containing filter information\n */\n static enum ice_status\n@@ -1578,7 +1578,7 @@ ice_remove_rule_internal(struct ice_hw *hw, u8 recp_id,\n \t\tstatus = ice_rem_update_vsi_list(hw, vsi_handle, list_elem);\n \t\tif (status)\n \t\t\tgoto exit;\n-\t\t/* if vsi count goes to zero after updating the vsi list */\n+\t\t/* if VSI count goes to zero after updating the VSI list */\n \t\tif (list_elem->vsi_count == 0)\n \t\t\tremove_rule = true;\n \t}\n@@ -1656,7 +1656,7 @@ ice_add_mac(struct ice_hw *hw, struct list_head *m_list)\n \t\t\treturn ICE_ERR_PARAM;\n \t\thw_vsi_id = ice_get_hw_vsi_num(hw, vsi_handle);\n \t\tm_list_itr->fltr_info.fwd_id.hw_vsi_id = hw_vsi_id;\n-\t\t/* update the src in case it is vsi num */\n+\t\t/* update the src in case it is VSI num */\n \t\tif (m_list_itr->fltr_info.src_id != ICE_SRC_ID_VSI)\n \t\t\treturn ICE_ERR_PARAM;\n \t\tm_list_itr->fltr_info.src = hw_vsi_id;\n@@ -1732,7 +1732,7 @@ ice_add_mac(struct ice_hw *hw, struct list_head *m_list)\n \t\t\t((u8 *)r_iter + (elem_sent * s_rule_size));\n \t}\n \n-\t/* Fill up rule id based on the value returned from FW */\n+\t/* Fill up rule ID based on the value returned from FW */\n \tr_iter = s_rule;\n \tlist_for_each_entry(m_list_itr, m_list, list_entry) {\n \t\tstruct ice_fltr_info *f_info = &m_list_itr->fltr_info;\n@@ -1792,7 +1792,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\tice_get_hw_vsi_num(hw, f_entry->fltr_info.vsi_handle);\n \tnew_fltr = &f_entry->fltr_info;\n \n-\t/* VLAN id should only be 12 bits */\n+\t/* VLAN ID should only be 12 bits */\n \tif (new_fltr->l_data.vlan.vlan_id > ICE_MAX_VLAN_ID)\n \t\treturn ICE_ERR_PARAM;\n \n@@ -1850,7 +1850,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\t\t}\n \t\t}\n \t} else if (v_list_itr->vsi_list_info->ref_cnt == 1) {\n-\t\t/* Update existing VSI list to add new VSI id only if it used\n+\t\t/* Update existing VSI list to add new VSI ID only if it used\n \t\t * by one VLAN rule.\n \t\t */\n \t\tcur_fltr = &v_list_itr->fltr_info;\n@@ -1860,7 +1860,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)\n \t\t/* If VLAN rule exists and VSI list being used by this rule is\n \t\t * referenced by more than 1 VLAN rule. Then create a new VSI\n \t\t * list appending previous VSI with new VSI and update existing\n-\t\t * VLAN rule to point to new VSI list id\n+\t\t * VLAN rule to point to new VSI list ID\n \t\t */\n \t\tstruct ice_fltr_info tmp_fltr;\n \t\tu16 vsi_handle_arr[2];\n@@ -2192,7 +2192,7 @@ ice_add_to_vsi_fltr_list(struct ice_hw *hw, u16 vsi_handle,\n \tstruct ice_fltr_mgmt_list_entry *fm_entry;\n \tenum ice_status status = 0;\n \n-\t/* check to make sure VSI id is valid and within boundary */\n+\t/* check to make sure VSI ID is valid and within boundary */\n \tif (!ice_is_vsi_valid(hw, vsi_handle))\n \t\treturn ICE_ERR_PARAM;\n \n@@ -2247,7 +2247,7 @@ static u8 ice_determine_promisc_mask(struct ice_fltr_info *fi)\n /**\n * ice_remove_promisc - Remove promisc based filter rules\n * @hw: pointer to the hardware structure\n- * @recp_id: recipe id for which the rule needs to removed\n+ * @recp_id: recipe ID for which the rule needs to removed\n * @v_list: list of promisc entries\n */\n static enum ice_status\n@@ -2572,7 +2572,7 @@ void ice_remove_vsi_fltr(struct ice_hw *hw, u16 vsi_handle)\n * ice_replay_vsi_fltr - Replay filters for requested VSI\n * @hw: pointer to the hardware structure\n * @vsi_handle: driver VSI handle\n- * @recp_id: Recipe id for which rules need to be replayed\n+ * @recp_id: Recipe ID for which rules need to be replayed\n * @list_head: list for which filters need to be replayed\n *\n * Replays the filter of recipe recp_id for a VSI represented via vsi_handle.\n@@ -2596,7 +2596,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,\n \t\tf_entry.fltr_info = itr->fltr_info;\n \t\tif (itr->vsi_count < 2 && recp_id != ICE_SW_LKUP_VLAN &&\n \t\t itr->fltr_info.vsi_handle == vsi_handle) {\n-\t\t\t/* update the src in case it is vsi num */\n+\t\t\t/* update the src in case it is VSI num */\n \t\t\tif (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)\n \t\t\t\tf_entry.fltr_info.src = hw_vsi_id;\n \t\t\tstatus = ice_add_rule_internal(hw, recp_id, &f_entry);\n@@ -2611,7 +2611,7 @@ ice_replay_vsi_fltr(struct ice_hw *hw, u16 vsi_handle, u8 recp_id,\n \t\tclear_bit(vsi_handle, itr->vsi_list_info->vsi_map);\n \t\tf_entry.fltr_info.vsi_handle = vsi_handle;\n \t\tf_entry.fltr_info.fltr_act = ICE_FWD_TO_VSI;\n-\t\t/* update the src in case it is vsi num */\n+\t\t/* update the src in case it is VSI num */\n \t\tif (f_entry.fltr_info.src_id == ICE_SRC_ID_VSI)\n \t\t\tf_entry.fltr_info.src = hw_vsi_id;\n \t\tif (recp_id == ICE_SW_LKUP_VLAN)\n@@ -2651,7 +2651,7 @@ enum ice_status ice_replay_vsi_all_fltr(struct ice_hw *hw, u16 vsi_handle)\n \n /**\n * ice_rm_all_sw_replay_rule_info - deletes filter replay rules\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n *\n * Deletes the filter replay rules.\n */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.h b/drivers/net/ethernet/intel/ice/ice_switch.h\nindex e4ce0720b871..64a2fecfce20 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.h\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.h\n@@ -44,7 +44,7 @@ enum ice_sw_lkup_type {\n \tICE_SW_LKUP_LAST\n };\n \n-/* type of filter src id */\n+/* type of filter src ID */\n enum ice_src_id {\n \tICE_SRC_ID_UNKNOWN = 0,\n \tICE_SRC_ID_VSI,\n@@ -95,8 +95,8 @@ struct ice_fltr_info {\n \n \t/* Depending on filter action */\n \tunion {\n-\t\t/* queue id in case of ICE_FWD_TO_Q and starting\n-\t\t * queue id in case of ICE_FWD_TO_QGRP.\n+\t\t/* queue ID in case of ICE_FWD_TO_Q and starting\n+\t\t * queue ID in case of ICE_FWD_TO_QGRP.\n \t\t */\n \t\tu16 q_id:11;\n \t\tu16 hw_vsi_id:10;\n@@ -143,7 +143,7 @@ struct ice_sw_recipe {\n \tDECLARE_BITMAP(r_bitmap, ICE_MAX_NUM_RECIPES);\n };\n \n-/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list id */\n+/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list ID */\n struct ice_vsi_list_map_info {\n \tstruct list_head list_entry;\n \tDECLARE_BITMAP(vsi_map, ICE_MAX_VSI);\n@@ -165,7 +165,7 @@ struct ice_fltr_list_entry {\n * used for VLAN membership.\n */\n struct ice_fltr_mgmt_list_entry {\n-\t/* back pointer to VSI list id to VSI list mapping */\n+\t/* back pointer to VSI list ID to VSI list mapping */\n \tstruct ice_vsi_list_map_info *vsi_list_info;\n \tu16 vsi_count;\n #define ICE_INVAL_LG_ACT_INDEX 0xffff\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex 85008e154aa2..35ac0b84a6b4 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -456,7 +456,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)\n \tif (!rx_ring->netdev || !cleaned_count)\n \t\treturn false;\n \n-\t/* get the RX descriptor and buffer based on next_to_use */\n+\t/* get the Rx descriptor and buffer based on next_to_use */\n \trx_desc = ICE_RX_DESC(rx_ring, ntu);\n \tbi = &rx_ring->rx_buf[ntu];\n \n@@ -515,13 +515,13 @@ static bool ice_page_is_reserved(struct page *page)\n }\n \n /**\n- * ice_rx_buf_adjust_pg_offset - Prepare rx buffer for reuse\n+ * ice_rx_buf_adjust_pg_offset - Prepare Rx buffer for reuse\n * @rx_buf: Rx buffer to adjust\n * @size: Size of adjustment\n *\n- * Update the offset within page so that rx buf will be ready to be reused.\n+ * Update the offset within page so that Rx buf will be ready to be reused.\n * For systems with PAGE_SIZE < 8192 this function will flip the page offset\n- * so the second half of page assigned to rx buffer will be used, otherwise\n+ * so the second half of page assigned to Rx buffer will be used, otherwise\n * the offset is moved by the @size bytes\n */\n static void\n@@ -537,7 +537,7 @@ ice_rx_buf_adjust_pg_offset(struct ice_rx_buf *rx_buf, unsigned int size)\n }\n \n /**\n- * ice_can_reuse_rx_page - Determine if page can be reused for another rx\n+ * ice_can_reuse_rx_page - Determine if page can be reused for another Rx\n * @rx_buf: buffer containing the page\n *\n * If page is reusable, we have a green light for calling ice_reuse_rx_page,\n@@ -959,10 +959,10 @@ ice_process_skb_fields(struct ice_ring *rx_ring,\n * ice_receive_skb - Send a completed packet up the stack\n * @rx_ring: Rx ring in play\n * @skb: packet to send up\n- * @vlan_tag: vlan tag for packet\n+ * @vlan_tag: VLAN tag for packet\n *\n * This function sends the completed packet (via. skb) up the stack using\n- * gro receive functions (with/without vlan tag)\n+ * gro receive functions (with/without VLAN tag)\n */\n static void\n ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)\n@@ -991,7 +991,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)\n \tu16 cleaned_count = ICE_DESC_UNUSED(rx_ring);\n \tbool failure = false;\n \n-\t/* start the loop to process RX packets bounded by 'budget' */\n+\t/* start the loop to process Rx packets bounded by 'budget' */\n \twhile (likely(total_rx_pkts < (unsigned int)budget)) {\n \t\tunion ice_32b_rx_flex_desc *rx_desc;\n \t\tstruct ice_rx_buf *rx_buf;\n@@ -1008,7 +1008,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)\n \t\t\tcleaned_count = 0;\n \t\t}\n \n-\t\t/* get the RX desc from RX ring based on 'next_to_clean' */\n+\t\t/* get the Rx desc from Rx ring based on 'next_to_clean' */\n \t\trx_desc = ICE_RX_DESC(rx_ring, rx_ring->next_to_clean);\n \n \t\t/* status_error_len will always be zero for unused descriptors\n@@ -1772,7 +1772,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off)\n }\n \n /**\n- * ice_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW\n+ * ice_tx_prepare_vlan_flags - prepare generic Tx VLAN tagging flags for HW\n * @tx_ring: ring to send buffer on\n * @first: pointer to struct ice_tx_buf\n *\ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex 3a4e67484487..119fda5674cc 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -107,7 +107,7 @@ struct ice_link_status {\n };\n \n /* Different reset sources for which a disable queue AQ call has to be made in\n- * order to clean the TX scheduler as a part of the reset\n+ * order to clean the Tx scheduler as a part of the reset\n */\n enum ice_disq_rst_src {\n \tICE_NO_RESET = 0,\n@@ -129,11 +129,11 @@ struct ice_phy_info {\n struct ice_hw_common_caps {\n \tu32 valid_functions;\n \n-\t/* TX/RX queues */\n-\tu16 num_rxq;\t\t/* Number/Total RX queues */\n-\tu16 rxq_first_id;\t/* First queue ID for RX queues */\n-\tu16 num_txq;\t\t/* Number/Total TX queues */\n-\tu16 txq_first_id;\t/* First queue ID for TX queues */\n+\t/* Tx/Rx queues */\n+\tu16 num_rxq;\t\t/* Number/Total Rx queues */\n+\tu16 rxq_first_id;\t/* First queue ID for Rx queues */\n+\tu16 num_txq;\t\t/* Number/Total Tx queues */\n+\tu16 txq_first_id;\t/* First queue ID for Tx queues */\n \n \t/* MSI-X vectors */\n \tu16 num_msix_vectors;\n@@ -218,7 +218,7 @@ struct ice_sched_node {\n \tstruct ice_sched_node *sibling; /* next sibling in the same layer */\n \tstruct ice_sched_node **children;\n \tstruct ice_aqc_txsched_elem_data info;\n-\tu32 agg_id;\t\t\t/* aggregator group id */\n+\tu32 agg_id;\t\t\t/* aggregator group ID */\n \tu16 vsi_handle;\n \tu8 in_use;\t\t\t/* suspended or in use */\n \tu8 tx_sched_layer;\t\t/* Logical Layer (1-9) */\n@@ -245,7 +245,7 @@ enum ice_agg_type {\n #define ICE_SCHED_DFLT_RL_PROF_ID\t0\n #define ICE_SCHED_DFLT_BW_WT\t\t1\n \n-/* vsi type list entry to locate corresponding vsi/ag nodes */\n+/* VSI type list entry to locate corresponding VSI/ag nodes */\n struct ice_sched_vsi_info {\n \tstruct ice_sched_node *vsi_node[ICE_MAX_TRAFFIC_CLASS];\n \tstruct ice_sched_node *ag_node[ICE_MAX_TRAFFIC_CLASS];\n@@ -262,7 +262,7 @@ struct ice_sched_tx_policy {\n \n struct ice_port_info {\n \tstruct ice_sched_node *root;\t/* Root Node per Port */\n-\tstruct ice_hw *hw;\t\t/* back pointer to hw instance */\n+\tstruct ice_hw *hw;\t\t/* back pointer to HW instance */\n \tu32 last_node_teid;\t\t/* scheduler last node info */\n \tu16 sw_id;\t\t\t/* Initial switch ID belongs to port */\n \tu16 pf_vf_num;\n@@ -323,7 +323,7 @@ struct ice_hw {\n \n \tu8 pf_id;\t\t/* device profile info */\n \n-\t/* TX Scheduler values */\n+\t/* Tx Scheduler values */\n \tu16 num_tx_sched_layers;\n \tu16 num_tx_sched_phys_layers;\n \tu8 flattened_layers;\n@@ -334,7 +334,7 @@ struct ice_hw {\n \n \tstruct ice_vsi_ctx *vsi_ctx[ICE_MAX_VSI];\n \tu8 evb_veb;\t\t/* true for VEB, false for VEPA */\n-\tu8 reset_ongoing;\t/* true if hw is in reset, false otherwise */\n+\tu8 reset_ongoing;\t/* true if HW is in reset, false otherwise */\n \tstruct ice_bus_info bus;\n \tstruct ice_nvm_info nvm;\n \tstruct ice_hw_dev_caps dev_caps;\t/* device capabilities */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex 6d1fc97c5eb1..e562ea15b79b 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -375,9 +375,9 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr)\n }\n \n /**\n- * ice_vsi_set_pvid_fill_ctxt - Set vsi ctxt for add pvid\n- * @ctxt: the vsi ctxt to fill\n- * @vid: the VLAN id to set as a PVID\n+ * ice_vsi_set_pvid_fill_ctxt - Set VSI ctxt for add PVID\n+ * @ctxt: the VSI ctxt to fill\n+ * @vid: the VLAN ID to set as a PVID\n */\n static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid)\n {\n@@ -391,7 +391,7 @@ static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid)\n }\n \n /**\n- * ice_vsi_kill_pvid_fill_ctxt - Set vsi ctx for remove pvid\n+ * ice_vsi_kill_pvid_fill_ctxt - Set VSI ctx for remove PVID\n * @ctxt: the VSI ctxt to fill\n */\n static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)\n@@ -404,10 +404,10 @@ static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)\n }\n \n /**\n- * ice_vsi_manage_pvid - Enable or disable port VLAN for vsi\n- * @vsi: the vsi to update\n- * @vid: the VLAN id to set as a PVID\n- * @enable: true for enable pvid false for disable\n+ * ice_vsi_manage_pvid - Enable or disable port VLAN for VSI\n+ * @vsi: the VSI to update\n+ * @vid: the VLAN ID to set as a PVID\n+ * @enable: true for enable PVID false for disable\n */\n static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)\n {\n@@ -445,7 +445,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)\n * ice_vf_vsi_setup - Set up a VF VSI\n * @pf: board private structure\n * @pi: pointer to the port_info instance\n- * @vf_id: defines VF id to which this VSI connects.\n+ * @vf_id: defines VF ID to which this VSI connects.\n *\n * Returns pointer to the successfully allocated VSI struct on success,\n * otherwise returns NULL on failure.\n@@ -1508,9 +1508,9 @@ static void ice_vc_reset_vf_msg(struct ice_vf *vf)\n /**\n * ice_find_vsi_from_id\n * @pf: the pf structure to search for the VSI\n- * @id: id of the VSI it is searching for\n+ * @id: ID of the VSI it is searching for\n *\n- * searches for the VSI with the given id\n+ * searches for the VSI with the given ID\n */\n static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)\n {\n@@ -1526,9 +1526,9 @@ static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)\n /**\n * ice_vc_isvalid_vsi_id\n * @vf: pointer to the VF info\n- * @vsi_id: VF relative VSI id\n+ * @vsi_id: VF relative VSI ID\n *\n- * check for the valid VSI id\n+ * check for the valid VSI ID\n */\n static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)\n {\n@@ -1543,10 +1543,10 @@ static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)\n /**\n * ice_vc_isvalid_q_id\n * @vf: pointer to the VF info\n- * @vsi_id: VSI id\n- * @qid: VSI relative queue id\n+ * @vsi_id: VSI ID\n+ * @qid: VSI relative queue ID\n *\n- * check for the valid queue id\n+ * check for the valid queue ID\n */\n static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)\n {\n@@ -2005,7 +2005,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf)\n * ice_vc_handle_mac_addr_msg\n * @vf: pointer to the VF info\n * @msg: pointer to the msg buffer\n- * @set: true if mac filters are being set, false otherwise\n+ * @set: true if MAC filters are being set, false otherwise\n *\n * add guest MAC address filter\n */\n@@ -2065,7 +2065,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)\n \t\t\t\t\t maddr, vf->vf_id);\n \t\t\t\tcontinue;\n \t\t\t} else {\n-\t\t\t\t/* VF can't remove dflt_lan_addr/bcast mac */\n+\t\t\t\t/* VF can't remove dflt_lan_addr/bcast MAC */\n \t\t\t\tdev_err(&pf->pdev->dev,\n \t\t\t\t\t\"VF can't remove default MAC address or MAC %pM programmed by PF for VF %d\\n\",\n \t\t\t\t\tmaddr, vf->vf_id);\n@@ -2091,7 +2091,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)\n \t\t\tgoto handle_mac_exit;\n \t\t}\n \n-\t\t/* get here if maddr is multicast or if VF can change mac */\n+\t\t/* get here if maddr is multicast or if VF can change MAC */\n \t\tif (ice_add_mac_to_list(vsi, &mac_list, al->list[i].addr)) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;\n \t\t\tgoto handle_mac_exit;\n@@ -2154,7 +2154,7 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg)\n * VFs get a default number of queues but can use this message to request a\n * different number. If the request is successful, PF will reset the VF and\n * return 0. If unsuccessful, PF will send message informing VF of number of\n- * available queue pairs via virtchnl message response to vf.\n+ * available queue pairs via virtchnl message response to VF.\n */\n static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n {\n@@ -2210,11 +2210,11 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n * ice_set_vf_port_vlan\n * @netdev: network interface device structure\n * @vf_id: VF identifier\n- * @vlan_id: VLAN id being set\n+ * @vlan_id: VLAN ID being set\n * @qos: priority setting\n * @vlan_proto: VLAN protocol\n *\n- * program VF Port VLAN id and/or qos\n+ * program VF Port VLAN ID and/or QoS\n */\n int\n ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n@@ -2257,7 +2257,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n \t\treturn ret;\n \t}\n \n-\t/* If pvid, then remove all filters on the old VLAN */\n+\t/* If PVID, then remove all filters on the old VLAN */\n \tif (vsi->info.pvid)\n \t\tice_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &\n \t\t\t\t VLAN_VID_MASK));\n@@ -2296,7 +2296,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,\n * @msg: pointer to the msg buffer\n * @add_v: Add VLAN if true, otherwise delete VLAN\n *\n- * Process virtchnl op to add or remove programmed guest VLAN id\n+ * Process virtchnl op to add or remove programmed guest VLAN ID\n */\n static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n {\n@@ -2443,7 +2443,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n * @vf: pointer to the VF info\n * @msg: pointer to the msg buffer\n *\n- * Add and program guest VLAN id\n+ * Add and program guest VLAN ID\n */\n static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)\n {\n@@ -2455,7 +2455,7 @@ static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)\n * @vf: pointer to the VF info\n * @msg: pointer to the msg buffer\n *\n- * remove programmed guest VLAN id\n+ * remove programmed guest VLAN ID\n */\n static int ice_vc_remove_vlan_msg(struct ice_vf *vf, u8 *msg)\n {\n@@ -2771,9 +2771,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)\n * ice_set_vf_mac\n * @netdev: network interface device structure\n * @vf_id: VF identifier\n- * @mac: mac address\n+ * @mac: MAC address\n *\n- * program VF mac address\n+ * program VF MAC address\n */\n int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n {\n@@ -2800,7 +2800,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \t\treturn -EINVAL;\n \t}\n \n-\t/* copy mac into dflt_lan_addr and trigger a VF reset. The reset\n+\t/* copy MAC into dflt_lan_addr and trigger a VF reset. The reset\n \t * flow will use the updated dflt_lan_addr and add a MAC filter\n \t * using ice_add_mac. Also set pf_set_mac to indicate that the PF has\n \t * set the MAC address for this VF.\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\nindex 5682f58110e7..57903d157c21 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h\n@@ -48,10 +48,10 @@ enum ice_virtchnl_cap {\n struct ice_vf {\n \tstruct ice_pf *pf;\n \n-\ts16 vf_id;\t\t\t/* VF id in the PF space */\n+\ts16 vf_id;\t\t\t/* VF ID in the PF space */\n \tu32 driver_caps;\t\t/* reported by VF driver */\n \tint first_vector_idx;\t\t/* first vector index of this VF */\n-\tstruct ice_sw *vf_sw_id;\t/* switch id the VF VSIs connect to */\n+\tstruct ice_sw *vf_sw_id;\t/* switch ID the VF VSIs connect to */\n \tstruct virtchnl_version_info vf_ver;\n \tstruct virtchnl_ether_addr dflt_lan_addr;\n \tu16 port_vlan_id;\n@@ -59,10 +59,10 @@ struct ice_vf {\n \tu8 trusted;\n \tu16 lan_vsi_idx;\t\t/* index into PF struct */\n \tu16 lan_vsi_num;\t\t/* ID as used by firmware */\n-\tu64 num_mdd_events;\t\t/* number of mdd events detected */\n+\tu64 num_mdd_events;\t\t/* number of MDD events detected */\n \tu64 num_inval_msgs;\t\t/* number of continuous invalid msgs */\n \tu64 num_valid_msgs;\t\t/* number of valid msgs detected */\n-\tunsigned long vf_caps;\t\t/* vf's adv. capabilities */\n+\tunsigned long vf_caps;\t\t/* VF's adv. capabilities */\n \tDECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS);\t/* VF runtime states */\n \tunsigned int tx_rate;\t\t/* Tx bandwidth limit in Mbps */\n \tu8 link_forced;\n", "prefixes": [ "S15", "13/14" ] }