Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1086506/?format=api
{ "id": 1086506, "url": "http://patchwork.ozlabs.org/api/patches/1086506/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190416173503.29847-15-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": "<20190416173503.29847-15-anirudh.venkataramanan@intel.com>", "list_archive_url": null, "date": "2019-04-16T17:35:03", "name": "[S21,14/14] ice: Trivial cosmetic changes", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "519b87d20d634f6c8dfc9ba713ff658889603994", "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/20190416173503.29847-15-anirudh.venkataramanan@intel.com/mbox/", "series": [ { "id": 103110, "url": "http://patchwork.ozlabs.org/api/series/103110/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103110", "date": "2019-04-16T17:34:49", "name": "Fixes and feature updates for ice", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103110/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1086506/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1086506/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.136; helo=silver.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 silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\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 44kCFv40SDz9s55\n\tfor <incoming@patchwork.ozlabs.org>;\n\tWed, 17 Apr 2019 03:36:03 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id E013D23223;\n\tTue, 16 Apr 2019 17:36:01 +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 6nuoRn9EJsvr; Tue, 16 Apr 2019 17:35:51 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby silver.osuosl.org (Postfix) with ESMTP id 3A95D2670B;\n\tTue, 16 Apr 2019 17:35:49 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 0D4281BF9A0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:35:43 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 0AB4D2206D\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:35:43 +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 9hSnHJvJ3TZ5 for <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:35:39 +0000 (UTC)", "from mga17.intel.com (mga17.intel.com [192.55.52.151])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 29EB325D07\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tTue, 16 Apr 2019 17:35:38 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Apr 2019 10:35:37 -0700", "from shasta.jf.intel.com ([10.166.244.191])\n\tby fmsmga001.fm.intel.com with ESMTP; 16 Apr 2019 10:35:37 -0700" ], "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.60,358,1549958400\"; d=\"scan'208\";a=\"165278574\"", "From": "Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Tue, 16 Apr 2019 10:35:03 -0700", "Message-Id": "<20190416173503.29847-15-anirudh.venkataramanan@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20190416173503.29847-1-anirudh.venkataramanan@intel.com>", "References": "<20190416173503.29847-1-anirudh.venkataramanan@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S21 14/14] ice: Trivial cosmetic changes", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "This patch mostly capitalizes abbreviations in code comments. Fixed some\ntypos and removed some unnecessary newlines as well.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n---\n .../net/ethernet/intel/ice/ice_adminq_cmd.h | 4 +-\n drivers/net/ethernet/intel/ice/ice_common.c | 12 +++---\n drivers/net/ethernet/intel/ice/ice_controlq.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_controlq.h | 2 +-\n drivers/net/ethernet/intel/ice/ice_dcb.c | 14 +++----\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 12 +++---\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_lib.c | 4 +-\n drivers/net/ethernet/intel/ice/ice_main.c | 42 +++++++++----------\n drivers/net/ethernet/intel/ice/ice_switch.c | 2 +-\n drivers/net/ethernet/intel/ice/ice_txrx.c | 8 ++--\n drivers/net/ethernet/intel/ice/ice_type.h | 2 +-\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 9 ++--\n 13 files changed, 57 insertions(+), 58 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\nindex 7a9da5320e96..765e3c2ed045 100644\n--- a/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n+++ b/drivers/net/ethernet/intel/ice/ice_adminq_cmd.h\n@@ -1273,7 +1273,7 @@ struct ice_aqc_get_cee_dcb_cfg_resp {\n };\n \n /* Set Local LLDP MIB (indirect 0x0A08)\n- * Used to replace the local MIB of a given LLDP agent. e.g. DCBx\n+ * Used to replace the local MIB of a given LLDP agent. e.g. DCBX\n */\n struct ice_aqc_lldp_set_local_mib {\n \tu8 type;\n@@ -1290,7 +1290,7 @@ struct ice_aqc_lldp_set_local_mib {\n };\n \n /* Stop/Start LLDP Agent (direct 0x0A09)\n- * Used for stopping/starting specific LLDP agent. e.g. DCBx.\n+ * Used for stopping/starting specific LLDP agent. e.g. DCBX.\n * The same structure is used for the response, with the command field\n * being used as the status field.\n */\ndiff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c\nindex ba6ad90e8907..8a3b04c38e2f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_common.c\n+++ b/drivers/net/ethernet/intel/ice/ice_common.c\n@@ -499,7 +499,7 @@ static enum ice_status ice_get_fw_log_cfg(struct ice_hw *hw)\n \tif (!status) {\n \t\tu16 i;\n \n-\t\t/* Save fw logging information into the hw structure */\n+\t\t/* Save fw logging information into the HW structure */\n \t\tfor (i = 0; i < ICE_AQC_FW_LOG_ID_MAX; i++) {\n \t\t\tu16 v, m, flgs;\n \n@@ -691,7 +691,7 @@ void ice_output_fw_log(struct ice_hw *hw, struct ice_aq_desc *desc, void *buf)\n * ice_get_itr_intrl_gran - determine int/intrl granularity\n * @hw: pointer to the HW struct\n *\n- * Determines the itr/intrl granularities based on the maximum aggregate\n+ * Determines the ITR/intrl granularities based on the maximum aggregate\n * bandwidth according to the device's configuration during power-on.\n */\n static void ice_get_itr_intrl_gran(struct ice_hw *hw)\n@@ -2699,7 +2699,7 @@ ice_aq_dis_lan_txq(struct ice_hw *hw, u8 num_qgrps,\n \t\t\tice_debug(hw, ICE_DBG_SCHED, \"VM%d disable failed %d\\n\",\n \t\t\t\t vmvf_num, hw->adminq.sq_last_status);\n \t\telse\n-\t\t\tice_debug(hw, ICE_DBG_SCHED, \"disable Q %d failed %d\\n\",\n+\t\t\tice_debug(hw, ICE_DBG_SCHED, \"disable queue %d failed %d\\n\",\n \t\t\t\t le16_to_cpu(qg_list[0].q_id[0]),\n \t\t\t\t hw->adminq.sq_last_status);\n \t}\n@@ -2930,10 +2930,10 @@ ice_set_ctx(u8 *src_ctx, u8 *dest_ctx, const struct ice_ctx_ele *ce_info)\n }\n \n /**\n- * ice_get_lan_q_ctx - get the lan queue context for the given VSI and TC\n- * @hw: pointer to the hw struct\n+ * ice_get_lan_q_ctx - get the LAN queue context for the given VSI and TC\n+ * @hw: pointer to the HW struct\n * @vsi_handle: software VSI handle\n- * @tc: tc number\n+ * @tc: TC number\n * @q_handle: software queue handle\n */\n static struct ice_q_ctx *\ndiff --git a/drivers/net/ethernet/intel/ice/ice_controlq.c b/drivers/net/ethernet/intel/ice/ice_controlq.c\nindex cc8cb5fdcdc1..e91ac4df0242 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.c\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.c\n@@ -439,7 +439,7 @@ do {\t\t\t\t\t\t\t\t\t\\\n \t/* free the buffer info list */\t\t\t\t\t\\\n \tif ((qi)->ring.cmd_buf)\t\t\t\t\t\t\\\n \t\tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.cmd_buf);\t\\\n-\t/* free dma head */\t\t\t\t\t\t\\\n+\t/* free DMA head */\t\t\t\t\t\t\\\n \tdevm_kfree(ice_hw_to_dev(hw), (qi)->ring.dma_head);\t\t\\\n } while (0)\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_controlq.h b/drivers/net/ethernet/intel/ice/ice_controlq.h\nindex e0585394d984..44945c2165d8 100644\n--- a/drivers/net/ethernet/intel/ice/ice_controlq.h\n+++ b/drivers/net/ethernet/intel/ice/ice_controlq.h\n@@ -35,7 +35,7 @@ enum ice_ctl_q {\n #define ICE_CTL_Q_SQ_CMD_TIMEOUT\t250 /* msecs */\n \n struct ice_ctl_q_ring {\n-\tvoid *dma_head;\t\t\t/* Virtual address to dma head */\n+\tvoid *dma_head;\t\t\t/* Virtual address to DMA head */\n \tstruct ice_dma_mem desc_buf;\t/* descriptor ring memory */\n \tvoid *cmd_buf;\t\t\t/* command buffer memory */\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb.c b/drivers/net/ethernet/intel/ice/ice_dcb.c\nindex 817ae688082b..c70c3d6ba916 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb.c\n@@ -669,7 +669,7 @@ ice_lldp_to_dcb_cfg(u8 *lldpmib, struct ice_dcbx_cfg *dcbcfg)\n /**\n * ice_aq_get_dcb_cfg\n * @hw: pointer to the HW struct\n- * @mib_type: mib type for the query\n+ * @mib_type: MIB type for the query\n * @bridgetype: bridge type for the query (remote)\n * @dcbcfg: store for LLDPDU data\n *\n@@ -700,13 +700,13 @@ ice_aq_get_dcb_cfg(struct ice_hw *hw, u8 mib_type, u8 bridgetype,\n }\n \n /**\n- * ice_aq_start_stop_dcbx - Start/Stop DCBx service in FW\n+ * ice_aq_start_stop_dcbx - Start/Stop DCBX service in FW\n * @hw: pointer to the HW struct\n- * @start_dcbx_agent: True if DCBx Agent needs to be started\n- *\t\t False if DCBx Agent needs to be stopped\n- * @dcbx_agent_status: FW indicates back the DCBx agent status\n- *\t\t True if DCBx Agent is active\n- *\t\t False if DCBx Agent is stopped\n+ * @start_dcbx_agent: True if DCBX Agent needs to be started\n+ *\t\t False if DCBX Agent needs to be stopped\n+ * @dcbx_agent_status: FW indicates back the DCBX agent status\n+ *\t\t True if DCBX Agent is active\n+ *\t\t False if DCBX Agent is stopped\n * @cd: pointer to command details structure or NULL\n *\n * Start/Stop the embedded dcbx Agent. In case that this wrapper function\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex b2e05ba79123..f0827e447043 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -283,7 +283,7 @@ void ice_dcb_rebuild(struct ice_pf *pf)\n \n /**\n * ice_dcb_init_cfg - set the initial DCB config in SW\n- * @pf: pf to apply config to\n+ * @pf: PF to apply config to\n * @locked: Is the RTNL held\n */\n static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked)\n@@ -311,7 +311,7 @@ static int ice_dcb_init_cfg(struct ice_pf *pf, bool locked)\n \n /**\n * ice_dcb_sw_default_config - Apply a default DCB config\n- * @pf: pf to apply config to\n+ * @pf: PF to apply config to\n * @locked: was this function called with RTNL held\n */\n static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool locked)\n@@ -356,7 +356,7 @@ static int ice_dcb_sw_dflt_cfg(struct ice_pf *pf, bool locked)\n \n /**\n * ice_init_pf_dcb - initialize DCB for a PF\n- * @pf: pf to initiialize DCB for\n+ * @pf: PF to initiialize DCB for\n * @locked: Was function called with RTNL held\n */\n int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n@@ -371,7 +371,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \n \terr = ice_init_dcb(hw);\n \tif (err) {\n-\t\t/* FW LLDP is not active, default to SW DCBx/LLDP */\n+\t\t/* FW LLDP is not active, default to SW DCBX/LLDP */\n \t\tdev_info(&pf->pdev->dev, \"FW LLDP is not active\\n\");\n \t\thw->port_info->dcbx_status = ICE_DCBX_STATUS_NOT_STARTED;\n \t\thw->port_info->is_sw_lldp = true;\n@@ -604,10 +604,10 @@ ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,\n \t/* store the old configuration */\n \ttmp_dcbx_cfg = pf->hw.port_info->local_dcbx_cfg;\n \n-\t/* Reset the old DCBx configuration data */\n+\t/* Reset the old DCBX configuration data */\n \tmemset(&pi->local_dcbx_cfg, 0, sizeof(pi->local_dcbx_cfg));\n \n-\t/* Get updated DCBx data from firmware */\n+\t/* Get updated DCBX data from firmware */\n \tret = ice_get_dcb_cfg(pf->hw.port_info);\n \tif (ret) {\n \t\tdev_err(&pf->pdev->dev, \"Failed to get DCB config\\n\");\ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 6beb918f625f..52083a63dee6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -1247,7 +1247,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)\n \t\t\t\tdev_warn(&pf->pdev->dev,\n \t\t\t\t\t \"Fail to start LLDP Agent\\n\");\n \n-\t\t\t/* AQ command to start FW DCBx agent will fail if\n+\t\t\t/* AQ command to start FW DCBX agent will fail if\n \t\t\t * the agent is already started\n \t\t\t */\n \t\t\tstatus = ice_aq_start_stop_dcbx(&pf->hw, true,\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex e203c7114803..91a914b5a9e1 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -2536,7 +2536,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,\n \t * recipe, since VSI/VSI list is ignored with drop action...\n \t * Also add rules to handle LLDP Tx and Rx packets. Tx LLDP packets\n \t * need to be dropped so that VFs cannot send LLDP packets to reconfig\n-\t * DCB settings in the HW. Also, if the FW DCBx engine is not running\n+\t * DCB settings in the HW. Also, if the FW DCBX engine is not running\n \t * then Rx LLDP packets need to be redirected up the stack.\n \t */\n \tif (vsi->type == ICE_VSI_PF) {\n@@ -3056,7 +3056,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi)\n \n /**\n * ice_is_reset_in_progress - check for a reset in progress\n- * @state: pf state field\n+ * @state: PF state field\n */\n bool ice_is_reset_in_progress(unsigned long *state)\n {\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex d34e2d529165..28ec0d57941d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -112,7 +112,7 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)\n * ice_init_mac_fltr - Set initial MAC filters\n * @pf: board private structure\n *\n- * Set initial set of mac filters for PF VSI; configure filters for permanent\n+ * Set initial set of MAC filters for PF VSI; configure filters for permanent\n * address and broadcast address. If an error is encountered, netdevice will be\n * unregistered.\n */\n@@ -682,13 +682,13 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)\n \n \tswitch (vsi->port_info->fc.current_mode) {\n \tcase ICE_FC_FULL:\n-\t\tfc = \"RX/TX\";\n+\t\tfc = \"Rx/Tx\";\n \t\tbreak;\n \tcase ICE_FC_TX_PAUSE:\n-\t\tfc = \"TX\";\n+\t\tfc = \"Tx\";\n \t\tbreak;\n \tcase ICE_FC_RX_PAUSE:\n-\t\tfc = \"RX\";\n+\t\tfc = \"Rx\";\n \t\tbreak;\n \tcase ICE_FC_NONE:\n \t\tfc = \"None\";\n@@ -770,7 +770,7 @@ static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)\n \n /**\n * ice_link_event - process the link event\n- * @pf: pf that the link event is associated with\n+ * @pf: PF that the link event is associated with\n * @pi: port_info for the port that the link event is associated with\n * @link_up: true if the physical link is up and false if it is down\n * @link_speed: current link speed received from the link event\n@@ -880,7 +880,7 @@ static int ice_init_link_events(struct ice_port_info *pi)\n \n /**\n * ice_handle_link_event - handle link event via ARQ\n- * @pf: pf that the link event is associated with\n+ * @pf: PF that the link event is associated with\n * @event: event structure containing link status info\n */\n static int\n@@ -2301,7 +2301,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \tif (!pf)\n \t\treturn -ENOMEM;\n \n-\t/* set up for high or low dma */\n+\t/* set up for high or low DMA */\n \terr = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));\n \tif (err)\n \t\terr = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32));\n@@ -2417,7 +2417,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \n \terr = ice_setup_pf_sw(pf);\n \tif (err) {\n-\t\tdev_err(dev, \"probe failed due to setup pf switch:%d\\n\", err);\n+\t\tdev_err(dev, \"probe failed due to setup PF switch:%d\\n\", err);\n \t\tgoto err_alloc_sw_unroll;\n \t}\n \n@@ -2674,7 +2674,7 @@ static int __init ice_module_init(void)\n \n \tstatus = pci_register_driver(&ice_driver);\n \tif (status) {\n-\t\tpr_err(\"failed to register pci driver, err %d\\n\", status);\n+\t\tpr_err(\"failed to register PCI driver, err %d\\n\", status);\n \t\tdestroy_workqueue(ice_wq);\n \t}\n \n@@ -2774,21 +2774,21 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)\n \tice_free_fltr_list(&pf->pdev->dev, &a_mac_list);\n \n \tif (err) {\n-\t\tnetdev_err(netdev, \"can't set mac %pM. filter update failed\\n\",\n+\t\tnetdev_err(netdev, \"can't set MAC %pM. filter update failed\\n\",\n \t\t\t mac);\n \t\treturn err;\n \t}\n \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+\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 \tflags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;\n \tstatus = ice_aq_manage_mac_write(hw, mac, flags, NULL);\n \tif (status) {\n-\t\tnetdev_err(netdev, \"can't set mac %pM. write to firmware failed.\\n\",\n+\t\tnetdev_err(netdev, \"can't set MAC %pM. write to firmware failed.\\n\",\n \t\t\t mac);\n \t}\n \treturn 0;\n@@ -3714,7 +3714,7 @@ static int ice_pf_ena_all_vsi(struct ice_pf *pf, bool locked)\n }\n \n /**\n- * ice_vsi_rebuild_all - rebuild all VSIs in pf\n+ * ice_vsi_rebuild_all - rebuild all VSIs in PF\n * @pf: the PF\n */\n static int ice_vsi_rebuild_all(struct ice_pf *pf)\n@@ -3784,7 +3784,7 @@ static int ice_vsi_replay_all(struct ice_pf *pf)\n \n /**\n * ice_rebuild - rebuild after reset\n- * @pf: pf to rebuild\n+ * @pf: PF to rebuild\n */\n static void ice_rebuild(struct ice_pf *pf)\n {\n@@ -3796,7 +3796,7 @@ static void ice_rebuild(struct ice_pf *pf)\n \tif (test_bit(__ICE_DOWN, pf->state))\n \t\tgoto clear_recovery;\n \n-\tdev_dbg(dev, \"rebuilding pf\\n\");\n+\tdev_dbg(dev, \"rebuilding PF\\n\");\n \n \tret = ice_init_all_ctrlq(hw);\n \tif (ret) {\n@@ -3907,16 +3907,16 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu)\n \tu8 count = 0;\n \n \tif (new_mtu == netdev->mtu) {\n-\t\tnetdev_warn(netdev, \"mtu is already %u\\n\", netdev->mtu);\n+\t\tnetdev_warn(netdev, \"MTU is already %u\\n\", netdev->mtu);\n \t\treturn 0;\n \t}\n \n \tif (new_mtu < netdev->min_mtu) {\n-\t\tnetdev_err(netdev, \"new mtu invalid. min_mtu is %d\\n\",\n+\t\tnetdev_err(netdev, \"new MTU invalid. min_mtu is %d\\n\",\n \t\t\t netdev->min_mtu);\n \t\treturn -EINVAL;\n \t} else if (new_mtu > netdev->max_mtu) {\n-\t\tnetdev_err(netdev, \"new mtu invalid. max_mtu is %d\\n\",\n+\t\tnetdev_err(netdev, \"new MTU invalid. max_mtu is %d\\n\",\n \t\t\t netdev->min_mtu);\n \t\treturn -EINVAL;\n \t}\n@@ -3932,7 +3932,7 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu)\n \t} while (count < 100);\n \n \tif (count == 100) {\n-\t\tnetdev_err(netdev, \"can't change mtu. Device is busy\\n\");\n+\t\tnetdev_err(netdev, \"can't change MTU. Device is busy\\n\");\n \t\treturn -EBUSY;\n \t}\n \n@@ -3944,13 +3944,13 @@ static int ice_change_mtu(struct net_device *netdev, int new_mtu)\n \n \t\terr = ice_down(vsi);\n \t\tif (err) {\n-\t\t\tnetdev_err(netdev, \"change mtu if_up err %d\\n\", err);\n+\t\t\tnetdev_err(netdev, \"change MTU if_up err %d\\n\", err);\n \t\t\treturn err;\n \t\t}\n \n \t\terr = ice_up(vsi);\n \t\tif (err) {\n-\t\t\tnetdev_err(netdev, \"change mtu if_up err %d\\n\", err);\n+\t\t\tnetdev_err(netdev, \"change MTU if_up err %d\\n\", err);\n \t\t\treturn err;\n \t\t}\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c\nindex 3dc29aa5fbcd..6b68ff8dae18 100644\n--- a/drivers/net/ethernet/intel/ice/ice_switch.c\n+++ b/drivers/net/ethernet/intel/ice/ice_switch.c\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_q_ctx - clear VSI queue contexts for all TCs\n- * @hw: pointer to the hw struct\n+ * @hw: pointer to the HW struct\n * @vsi_handle: VSI handle\n */\n static void ice_clear_vsi_q_ctx(struct ice_hw *hw, u16 vsi_handle)\ndiff --git a/drivers/net/ethernet/intel/ice/ice_txrx.c b/drivers/net/ethernet/intel/ice/ice_txrx.c\nindex a19dde262dee..8ee8d0d2814f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_txrx.c\n+++ b/drivers/net/ethernet/intel/ice/ice_txrx.c\n@@ -55,7 +55,7 @@ void ice_clean_tx_ring(struct ice_ring *tx_ring)\n \tif (!tx_ring->tx_buf)\n \t\treturn;\n \n-\t/* Free all the Tx ring sk_bufss */\n+\t/* Free all the Tx ring sk_buffs */\n \tfor (i = 0; i < tx_ring->count; i++)\n \t\tice_unmap_and_free_tx_buf(tx_ring, &tx_ring->tx_buf[i]);\n \n@@ -1101,7 +1101,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)\n * ice_adjust_itr_by_size_and_speed - Adjust ITR based on current traffic\n * @port_info: port_info structure containing the current link speed\n * @avg_pkt_size: average size of Tx or Rx packets based on clean routine\n- * @itr: itr value to update\n+ * @itr: ITR value to update\n *\n * Calculate how big of an increment should be applied to the ITR value passed\n * in based on wmem_default, SKB overhead, ethernet overhead, and the current\n@@ -1316,7 +1316,7 @@ ice_update_itr(struct ice_q_vector *q_vector, struct ice_ring_container *rc)\n */\n static u32 ice_buildreg_itr(u16 itr_idx, u16 itr)\n {\n-\t/* The itr value is reported in microseconds, and the register value is\n+\t/* The ITR value is reported in microseconds, and the register value is\n \t * recorded in 2 microsecond units. For this reason we only need to\n \t * shift by the GLINT_DYN_CTL_INTERVAL_S - ICE_ITR_GRAN_S to apply this\n \t * granularity as a shift instead of division. The mask makes sure the\n@@ -1650,7 +1650,7 @@ ice_tx_map(struct ice_ring *tx_ring, struct ice_tx_buf *first,\n \treturn;\n \n dma_error:\n-\t/* clear dma mappings for failed tx_buf map */\n+\t/* clear DMA mappings for failed tx_buf map */\n \tfor (;;) {\n \t\ttx_buf = &tx_ring->tx_buf[i];\n \t\tice_unmap_and_free_tx_buf(tx_ring, tx_buf);\ndiff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h\nindex 3474bccbab6d..24bbef8bbe69 100644\n--- a/drivers/net/ethernet/intel/ice/ice_type.h\n+++ b/drivers/net/ethernet/intel/ice/ice_type.h\n@@ -434,7 +434,7 @@ struct ice_hw {\n \tstruct ice_fw_log_cfg fw_log;\n \n /* Device max aggregate bandwidths corresponding to the GL_PWR_MODE_CTL\n- * register. Used for determining the itr/intrl granularity during\n+ * register. Used for determining the ITR/intrl granularity during\n * initialization.\n */\n #define ICE_MAX_AGG_BW_200G\t0x0\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex fff59ebf07ca..5d24b539648f 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -154,7 +154,7 @@ static void ice_free_vf_res(struct ice_vf *vf)\n \t */\n \tclear_bit(ICE_VF_STATE_INIT, vf->vf_states);\n \n-\t/* free vsi & disconnect it from the parent uplink */\n+\t/* free VSI and disconnect it from the parent uplink */\n \tif (vf->lan_vsi_idx) {\n \t\tice_vsi_release(pf->vsi[vf->lan_vsi_idx]);\n \t\tvf->lan_vsi_idx = 0;\n@@ -514,7 +514,6 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)\n \tvf->first_vector_idx = ice_calc_vf_first_vector_idx(pf, vf);\n \n \tvsi = ice_vf_vsi_setup(pf, pf->hw.port_info, vf->vf_id);\n-\n \tif (!vsi) {\n \t\tdev_err(&pf->pdev->dev, \"Failed to create VF VSI\\n\");\n \t\treturn -ENOMEM;\n@@ -1312,8 +1311,8 @@ static int ice_alloc_vfs(struct ice_pf *pf, u16 num_alloc_vfs)\n }\n \n /**\n- * ice_pf_state_is_nominal - checks the pf for nominal state\n- * @pf: pointer to pf to check\n+ * ice_pf_state_is_nominal - checks the PF for nominal state\n+ * @pf: pointer to PF to check\n *\n * Check the PF's state for a collection of bits that would indicate\n * the PF is in a state that would inhibit normal operation for\n@@ -1640,7 +1639,7 @@ static void ice_vc_reset_vf_msg(struct ice_vf *vf)\n \n /**\n * ice_find_vsi_from_id\n- * @pf: the pf structure to search for the VSI\n+ * @pf: the PF structure to search for the VSI\n * @id: ID of the VSI it is searching for\n *\n * searches for the VSI with the given ID\n", "prefixes": [ "S21", "14/14" ] }