Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1227506/?format=api
{ "id": 1227506, "url": "http://patchwork.ozlabs.org/api/patches/1227506/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200122152041.41498-12-anthony.l.nguyen@intel.com/", "project": { "id": 46, "url": "http://patchwork.ozlabs.org/api/projects/46/?format=api", "name": "Intel Wired Ethernet development", "link_name": "intel-wired-lan", "list_id": "intel-wired-lan.osuosl.org", "list_email": "intel-wired-lan@osuosl.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20200122152041.41498-12-anthony.l.nguyen@intel.com>", "list_archive_url": null, "date": "2020-01-22T15:20:38", "name": "[S37,12/15] ice: Make print statements more compact", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "acbdfc6d7efc1181fc10bc51c9c24fa0adf9778e", "submitter": { "id": 68875, "url": "http://patchwork.ozlabs.org/api/people/68875/?format=api", "name": "Tony Nguyen", "email": "anthony.l.nguyen@intel.com" }, "delegate": { "id": 68, "url": "http://patchwork.ozlabs.org/api/users/68/?format=api", "username": "jtkirshe", "first_name": "Jeff", "last_name": "Kirsher", "email": "jeffrey.t.kirsher@intel.com" }, "mbox": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20200122152041.41498-12-anthony.l.nguyen@intel.com/mbox/", "series": [ { "id": 154775, "url": "http://patchwork.ozlabs.org/api/series/154775/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=154775", "date": "2020-01-22T15:20:28", "name": "[S37,01/15] ice: Fix DCB rebuild after reset", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/154775/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1227506/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1227506/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org; spf=pass (sender SPF authorized)\n\tsmtp.mailfrom=osuosl.org (client-ip=140.211.166.137;\n\thelo=fraxinus.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 4832Kx4D6wz9sR0\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 23 Jan 2020 10:53:41 +1100 (AEDT)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 2C81286469;\n\tWed, 22 Jan 2020 23:53:40 +0000 (UTC)", "from fraxinus.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id WT82f-chvO_X; Wed, 22 Jan 2020 23:53:36 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 9A8258690E;\n\tWed, 22 Jan 2020 23:53:36 +0000 (UTC)", "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\tby ash.osuosl.org (Postfix) with ESMTP id 2E8B61BF281\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:53:29 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2AEEC880E0\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:53:29 +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 ni4rIiWQt5PQ for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:53:26 +0000 (UTC)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby hemlock.osuosl.org (Postfix) with ESMTPS id 43C18880E2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 22 Jan 2020 23:53:26 +0000 (UTC)", "from fmsmga008.fm.intel.com ([10.253.24.58])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t22 Jan 2020 15:53:25 -0800", "from unknown (HELO localhost.jf.intel.com) ([10.166.244.174])\n\tby fmsmga008.fm.intel.com with ESMTP; 22 Jan 2020 15:53:25 -0800" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,351,1574150400\"; d=\"scan'208\";a=\"222189289\"", "From": "Tony Nguyen <anthony.l.nguyen@intel.com>", "To": "intel-wired-lan@lists.osuosl.org", "Date": "Wed, 22 Jan 2020 07:20:38 -0800", "Message-Id": "<20200122152041.41498-12-anthony.l.nguyen@intel.com>", "X-Mailer": "git-send-email 2.20.1", "In-Reply-To": "<20200122152041.41498-1-anthony.l.nguyen@intel.com>", "References": "<20200122152041.41498-1-anthony.l.nguyen@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [PATCH S37 12/15] ice: Make print statements more\n\tcompact", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "Intel Wired Ethernet Linux Kernel Driver Development\n\t<intel-wired-lan.osuosl.org>", "List-Unsubscribe": "<https://lists.osuosl.org/mailman/options/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=unsubscribe>", "List-Archive": "<http://lists.osuosl.org/pipermail/intel-wired-lan/>", "List-Post": "<mailto:intel-wired-lan@osuosl.org>", "List-Help": "<mailto:intel-wired-lan-request@osuosl.org?subject=help>", "List-Subscribe": "<https://lists.osuosl.org/mailman/listinfo/intel-wired-lan>, \n\t<mailto:intel-wired-lan-request@osuosl.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "intel-wired-lan-bounces@osuosl.org", "Sender": "\"Intel-wired-lan\" <intel-wired-lan-bounces@osuosl.org>" }, "content": "From: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\n\nFormatting strings in print function calls (like dev_info, dev_err, etc.)\ncan exceed 80 columns without making checkpatch unhappy. So remove\nnewlines where applicable and make print statements more compact.\n\nSigned-off-by: Anirudh Venkataramanan <anirudh.venkataramanan@intel.com>\nSigned-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>\n---\n drivers/net/ethernet/intel/ice/ice_base.c | 22 +--\n drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 7 +-\n drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 10 +-\n drivers/net/ethernet/intel/ice/ice_ethtool.c | 42 ++---\n drivers/net/ethernet/intel/ice/ice_lib.c | 36 ++--\n drivers/net/ethernet/intel/ice/ice_main.c | 167 +++++++-----------\n .../net/ethernet/intel/ice/ice_virtchnl_pf.c | 62 +++----\n drivers/net/ethernet/intel/ice/ice_xsk.c | 4 +-\n 8 files changed, 123 insertions(+), 227 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c\nindex 8c7d08e2916e..46f427a95056 100644\n--- a/drivers/net/ethernet/intel/ice/ice_base.c\n+++ b/drivers/net/ethernet/intel/ice/ice_base.c\n@@ -405,8 +405,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t/* Absolute queue number out of 2K needs to be passed */\n \terr = ice_write_rxq_ctx(hw, &rlan_ctx, pf_q);\n \tif (err) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to set LAN Rx queue context for absolute Rx queue %d error: %d\\n\",\n \t\t\tpf_q, err);\n \t\treturn -EIO;\n \t}\n@@ -428,8 +427,7 @@ int ice_setup_rx_ctx(struct ice_ring *ring)\n \t ice_alloc_rx_bufs_slow_zc(ring, ICE_DESC_UNUSED(ring)) :\n \t ice_alloc_rx_bufs(ring, ICE_DESC_UNUSED(ring));\n \tif (err)\n-\t\tdev_info(ice_pf_to_dev(vsi->back),\n-\t\t\t \"Failed allocate some buffers on %sRx ring %d (pf_q %d)\\n\",\n+\t\tdev_info(ice_pf_to_dev(vsi->back), \"Failed allocate some buffers on %sRx ring %d (pf_q %d)\\n\",\n \t\t\t ring->xsk_umem ? \"UMEM enabled \" : \"\",\n \t\t\t ring->q_index, pf_q);\n \n@@ -490,8 +488,7 @@ int ice_vsi_ctrl_rx_ring(struct ice_vsi *vsi, bool ena, u16 rxq_idx)\n \t/* wait for the change to finish */\n \tret = ice_pf_rxq_wait(pf, pf_q, ena);\n \tif (ret)\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"VSI idx %d Rx ring %d %sable timeout\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"VSI idx %d Rx ring %d %sable timeout\\n\",\n \t\t\tvsi->idx, pf_q, (ena ? \"en\" : \"dis\"));\n \n \treturn ret;\n@@ -648,8 +645,7 @@ ice_vsi_cfg_txq(struct ice_vsi *vsi, struct ice_ring *ring,\n \tstatus = ice_ena_vsi_txq(vsi->port_info, vsi->idx, tc, ring->q_handle,\n \t\t\t\t 1, qg_buf, buf_len, NULL);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"Failed to set LAN Tx queue context, error: %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"Failed to set LAN Tx queue context, error: %d\\n\",\n \t\t\tstatus);\n \t\treturn -ENODEV;\n \t}\n@@ -815,14 +811,12 @@ ice_vsi_stop_tx_ring(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,\n \t * queues at the hardware level anyway.\n \t */\n \tif (status == ICE_ERR_RESET_ONGOING) {\n-\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Reset in progress. LAN Tx queues already disabled\\n\");\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back), \"Reset in progress. LAN Tx queues already disabled\\n\");\n \t} else if (status == ICE_ERR_DOES_NOT_EXIST) {\n-\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n-\t\t\t\"LAN Tx queues do not exist, nothing to disable\\n\");\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back), \"LAN Tx queues do not exist, nothing to disable\\n\");\n \t} else if (status) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Failed to disable LAN Tx queues, error: %d\\n\", status);\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to disable LAN Tx queues, error: %d\\n\",\n+\t\t\tstatus);\n \t\treturn -ENODEV;\n \t}\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\nindex 8268122face2..935797e962a2 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_lib.c\n@@ -611,8 +611,7 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\tgoto dcb_init_err;\n \t}\n \n-\tdev_info(dev,\n-\t\t \"DCB is enabled in the hardware, max number of TCs supported on this port are %d\\n\",\n+\tdev_info(dev, \"DCB is enabled in the hardware, max number of TCs supported on this port are %d\\n\",\n \t\t pf->hw.func_caps.common_cap.maxtc);\n \tif (err) {\n \t\tstruct ice_vsi *pf_vsi;\n@@ -622,8 +621,8 @@ int ice_init_pf_dcb(struct ice_pf *pf, bool locked)\n \t\tclear_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags);\n \t\terr = ice_dcb_sw_dflt_cfg(pf, true, locked);\n \t\tif (err) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"Failed to set local DCB config %d\\n\", err);\n+\t\t\tdev_err(dev, \"Failed to set local DCB config %d\\n\",\n+\t\t\t\terr);\n \t\t\terr = -EIO;\n \t\t\tgoto dcb_init_err;\n \t\t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\nindex 265cf69b321b..b61aba428adb 100644\n--- a/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\n+++ b/drivers/net/ethernet/intel/ice/ice_dcb_nl.c\n@@ -297,8 +297,7 @@ ice_dcbnl_get_pfc_cfg(struct net_device *netdev, int prio, u8 *setting)\n \t\treturn;\n \n \t*setting = (pi->local_dcbx_cfg.pfc.pfcena >> prio) & 0x1;\n-\tdev_dbg(ice_pf_to_dev(pf),\n-\t\t\"Get PFC Config up=%d, setting=%d, pfcenable=0x%x\\n\",\n+\tdev_dbg(ice_pf_to_dev(pf), \"Get PFC Config up=%d, setting=%d, pfcenable=0x%x\\n\",\n \t\tprio, *setting, pi->local_dcbx_cfg.pfc.pfcena);\n }\n \n@@ -418,8 +417,8 @@ ice_dcbnl_get_pg_tc_cfg_tx(struct net_device *netdev, int prio,\n \t\treturn;\n \n \t*pgid = pi->local_dcbx_cfg.etscfg.prio_table[prio];\n-\tdev_dbg(ice_pf_to_dev(pf),\n-\t\t\"Get PG config prio=%d tc=%d\\n\", prio, *pgid);\n+\tdev_dbg(ice_pf_to_dev(pf), \"Get PG config prio=%d tc=%d\\n\", prio,\n+\t\t*pgid);\n }\n \n /**\n@@ -882,8 +881,7 @@ ice_dcbnl_vsi_del_app(struct ice_vsi *vsi,\n \tsapp.protocol = app->prot_id;\n \tsapp.priority = app->priority;\n \terr = ice_dcbnl_delapp(vsi->netdev, &sapp);\n-\tdev_dbg(ice_pf_to_dev(vsi->back),\n-\t\t\"Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\\n\",\n+\tdev_dbg(ice_pf_to_dev(vsi->back), \"Deleting app for VSI idx=%d err=%d sel=%d proto=0x%x, prio=%d\\n\",\n \t\tvsi->idx, err, app->selector, app->prot_id, app->priority);\n }\n \ndiff --git a/drivers/net/ethernet/intel/ice/ice_ethtool.c b/drivers/net/ethernet/intel/ice/ice_ethtool.c\nindex 8110da94c979..4b29d1ae56a7 100644\n--- a/drivers/net/ethernet/intel/ice/ice_ethtool.c\n+++ b/drivers/net/ethernet/intel/ice/ice_ethtool.c\n@@ -374,8 +374,7 @@ static int ice_reg_pattern_test(struct ice_hw *hw, u32 reg, u32 mask)\n \t\tval = rd32(hw, reg);\n \t\tif (val == pattern)\n \t\t\tcontinue;\n-\t\tdev_err(dev,\n-\t\t\t\"%s: reg pattern test failed - reg 0x%08x pat 0x%08x val 0x%08x\\n\"\n+\t\tdev_err(dev, \"%s: reg pattern test failed - reg 0x%08x pat 0x%08x val 0x%08x\\n\"\n \t\t\t, __func__, reg, pattern, val);\n \t\treturn 1;\n \t}\n@@ -383,8 +382,7 @@ static int ice_reg_pattern_test(struct ice_hw *hw, u32 reg, u32 mask)\n \twr32(hw, reg, orig_val);\n \tval = rd32(hw, reg);\n \tif (val != orig_val) {\n-\t\tdev_err(dev,\n-\t\t\t\"%s: reg restore test failed - reg 0x%08x orig 0x%08x val 0x%08x\\n\"\n+\t\tdev_err(dev, \"%s: reg restore test failed - reg 0x%08x orig 0x%08x val 0x%08x\\n\"\n \t\t\t, __func__, reg, orig_val, val);\n \t\treturn 1;\n \t}\n@@ -802,8 +800,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test,\n \t\tset_bit(__ICE_TESTING, pf->state);\n \n \t\tif (ice_active_vfs(pf)) {\n-\t\t\tdev_warn(dev,\n-\t\t\t\t \"Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\\n\");\n+\t\t\tdev_warn(dev, \"Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\\n\");\n \t\t\tdata[ICE_ETH_TEST_REG] = 1;\n \t\t\tdata[ICE_ETH_TEST_EEPROM] = 1;\n \t\t\tdata[ICE_ETH_TEST_INTR] = 1;\n@@ -1211,8 +1208,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)\n \t\t\t * events to respond to.\n \t\t\t */\n \t\t\tif (status)\n-\t\t\t\tdev_info(dev,\n-\t\t\t\t\t \"Failed to unreg for LLDP events\\n\");\n+\t\t\t\tdev_info(dev, \"Failed to unreg for LLDP events\\n\");\n \n \t\t\t/* The AQ call to stop the FW LLDP agent will generate\n \t\t\t * an error if the agent is already stopped.\n@@ -1267,8 +1263,7 @@ static int ice_set_priv_flags(struct net_device *netdev, u32 flags)\n \t\t\t/* Register for MIB change events */\n \t\t\tstatus = ice_cfg_lldp_mib_change(&pf->hw, true);\n \t\t\tif (status)\n-\t\t\t\tdev_dbg(dev,\n-\t\t\t\t\t\"Fail to enable MIB change events\\n\");\n+\t\t\t\tdev_dbg(dev, \"Fail to enable MIB change events\\n\");\n \t\t}\n \t}\n \tif (test_bit(ICE_FLAG_LEGACY_RX, change_flags)) {\n@@ -1761,8 +1756,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,\n \t\tks->base.speed = SPEED_100;\n \t\tbreak;\n \tdefault:\n-\t\tnetdev_info(netdev,\n-\t\t\t \"WARNING: Unrecognized link_speed (0x%x).\\n\",\n+\t\tnetdev_info(netdev, \"WARNING: Unrecognized link_speed (0x%x).\\n\",\n \t\t\t link_info->link_speed);\n \t\tbreak;\n \t}\n@@ -2578,13 +2572,11 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)\n \n \tnew_tx_cnt = ALIGN(ring->tx_pending, ICE_REQ_DESC_MULTIPLE);\n \tif (new_tx_cnt != ring->tx_pending)\n-\t\tnetdev_info(netdev,\n-\t\t\t \"Requested Tx descriptor count rounded up to %d\\n\",\n+\t\tnetdev_info(netdev, \"Requested Tx descriptor count rounded up to %d\\n\",\n \t\t\t new_tx_cnt);\n \tnew_rx_cnt = ALIGN(ring->rx_pending, ICE_REQ_DESC_MULTIPLE);\n \tif (new_rx_cnt != ring->rx_pending)\n-\t\tnetdev_info(netdev,\n-\t\t\t \"Requested Rx descriptor count rounded up to %d\\n\",\n+\t\tnetdev_info(netdev, \"Requested Rx descriptor count rounded up to %d\\n\",\n \t\t\t new_rx_cnt);\n \n \t/* if nothing to do return success */\n@@ -3451,8 +3443,7 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,\n \t\tif (ec->rx_coalesce_usecs_high > ICE_MAX_INTRL ||\n \t\t (ec->rx_coalesce_usecs_high &&\n \t\t ec->rx_coalesce_usecs_high < pf->hw.intrl_gran)) {\n-\t\t\tnetdev_info(vsi->netdev,\n-\t\t\t\t \"Invalid value, %s-usecs-high valid values are 0 (disabled), %d-%d\\n\",\n+\t\t\tnetdev_info(vsi->netdev, \"Invalid value, %s-usecs-high valid values are 0 (disabled), %d-%d\\n\",\n \t\t\t\t c_type_str, pf->hw.intrl_gran,\n \t\t\t\t ICE_MAX_INTRL);\n \t\t\treturn -EINVAL;\n@@ -3470,8 +3461,7 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,\n \t\tbreak;\n \tcase ICE_TX_CONTAINER:\n \t\tif (ec->tx_coalesce_usecs_high) {\n-\t\t\tnetdev_info(vsi->netdev,\n-\t\t\t\t \"setting %s-usecs-high is not supported\\n\",\n+\t\t\tnetdev_info(vsi->netdev, \"setting %s-usecs-high is not supported\\n\",\n \t\t\t\t c_type_str);\n \t\t\treturn -EINVAL;\n \t\t}\n@@ -3488,23 +3478,20 @@ ice_set_rc_coalesce(enum ice_container_type c_type, struct ethtool_coalesce *ec,\n \n \titr_setting = rc->itr_setting & ~ICE_ITR_DYNAMIC;\n \tif (coalesce_usecs != itr_setting && use_adaptive_coalesce) {\n-\t\tnetdev_info(vsi->netdev,\n-\t\t\t \"%s interrupt throttling cannot be changed if adaptive-%s is enabled\\n\",\n+\t\tnetdev_info(vsi->netdev, \"%s interrupt throttling cannot be changed if adaptive-%s is enabled\\n\",\n \t\t\t c_type_str, c_type_str);\n \t\treturn -EINVAL;\n \t}\n \n \tif (coalesce_usecs > ICE_ITR_MAX) {\n-\t\tnetdev_info(vsi->netdev,\n-\t\t\t \"Invalid value, %s-usecs range is 0-%d\\n\",\n+\t\tnetdev_info(vsi->netdev, \"Invalid value, %s-usecs range is 0-%d\\n\",\n \t\t\t c_type_str, ICE_ITR_MAX);\n \t\treturn -EINVAL;\n \t}\n \n \t/* hardware only supports an ITR granularity of 2us */\n \tif (coalesce_usecs % 2 != 0) {\n-\t\tnetdev_info(vsi->netdev,\n-\t\t\t \"Invalid value, %s-usecs must be even\\n\",\n+\t\tnetdev_info(vsi->netdev, \"Invalid value, %s-usecs must be even\\n\",\n \t\t\t c_type_str);\n \t\treturn -EINVAL;\n \t}\n@@ -3745,8 +3732,7 @@ ice_get_module_info(struct net_device *netdev,\n \t\t}\n \t\tbreak;\n \tdefault:\n-\t\tnetdev_warn(netdev,\n-\t\t\t \"SFF Module Type not recognized.\\n\");\n+\t\tnetdev_warn(netdev, \"SFF Module Type not recognized.\\n\");\n \t\treturn -EINVAL;\n \t}\n \treturn 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c\nindex ac06f0141740..7d546c75dcc6 100644\n--- a/drivers/net/ethernet/intel/ice/ice_lib.c\n+++ b/drivers/net/ethernet/intel/ice/ice_lib.c\n@@ -117,8 +117,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)\n \t\tvsi->num_tx_desc = ICE_DFLT_NUM_TX_DESC;\n \t\tbreak;\n \tdefault:\n-\t\tdev_dbg(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Not setting number of Tx/Rx descriptors for VSI type %d\\n\",\n+\t\tdev_dbg(ice_pf_to_dev(vsi->back), \"Not setting number of Tx/Rx descriptors for VSI type %d\\n\",\n \t\t\tvsi->type);\n \t\tbreak;\n \t}\n@@ -940,8 +939,7 @@ static int ice_vsi_setup_vector_base(struct ice_vsi *vsi)\n \tvsi->base_vector = ice_get_res(pf, pf->irq_tracker, num_q_vectors,\n \t\t\t\t vsi->idx);\n \tif (vsi->base_vector < 0) {\n-\t\tdev_err(dev,\n-\t\t\t\"Failed to get tracking for %d vectors for VSI %d, err=%d\\n\",\n+\t\tdev_err(dev, \"Failed to get tracking for %d vectors for VSI %d, err=%d\\n\",\n \t\t\tnum_q_vectors, vsi->vsi_num, vsi->base_vector);\n \t\treturn -ENOENT;\n \t}\n@@ -1427,12 +1425,10 @@ int ice_vsi_kill_vlan(struct ice_vsi *vsi, u16 vid)\n \n \tstatus = ice_remove_vlan(&pf->hw, &tmp_add_list);\n \tif (status == ICE_ERR_DOES_NOT_EXIST) {\n-\t\tdev_dbg(dev,\n-\t\t\t\"Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\\n\",\n+\t\tdev_dbg(dev, \"Failed to remove VLAN %d on VSI %i, it does not exist, status: %d\\n\",\n \t\t\tvid, vsi->vsi_num, status);\n \t} else if (status) {\n-\t\tdev_err(dev,\n-\t\t\t\"Error removing VLAN %d on vsi %i error: %d\\n\",\n+\t\tdev_err(dev, \"Error removing VLAN %d on vsi %i error: %d\\n\",\n \t\t\tvid, vsi->vsi_num, status);\n \t\terr = -EIO;\n \t}\n@@ -1488,8 +1484,7 @@ int ice_vsi_cfg_rxqs(struct ice_vsi *vsi)\n \n \t\terr = ice_setup_rx_ctx(vsi->rx_rings[i]);\n \t\tif (err) {\n-\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\t\"ice_setup_rx_ctx failed for RxQ %d, err %d\\n\",\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"ice_setup_rx_ctx failed for RxQ %d, err %d\\n\",\n \t\t\t\ti, err);\n \t\t\treturn err;\n \t\t}\n@@ -1869,8 +1864,7 @@ ice_vsi_set_q_vectors_reg_idx(struct ice_vsi *vsi)\n \t\tstruct ice_q_vector *q_vector = vsi->q_vectors[i];\n \n \t\tif (!q_vector) {\n-\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\t\"Failed to set reg_idx on q_vector %d VSI %d\\n\",\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to set reg_idx on q_vector %d VSI %d\\n\",\n \t\t\t\ti, vsi->vsi_num);\n \t\t\tgoto clear_reg_idx;\n \t\t}\n@@ -1933,8 +1927,7 @@ ice_vsi_add_rem_eth_mac(struct ice_vsi *vsi, bool add_rule)\n \t\tstatus = ice_remove_eth_mac(&pf->hw, &tmp_add_list);\n \n \tif (status)\n-\t\tdev_err(dev,\n-\t\t\t\"Failure Adding or Removing Ethertype on VSI %i error: %d\\n\",\n+\t\tdev_err(dev, \"Failure Adding or Removing Ethertype on VSI %i error: %d\\n\",\n \t\t\tvsi->vsi_num, status);\n \n \tice_free_fltr_list(dev, &tmp_add_list);\n@@ -2434,8 +2427,7 @@ ice_get_res(struct ice_pf *pf, struct ice_res_tracker *res, u16 needed, u16 id)\n \t\treturn -EINVAL;\n \n \tif (!needed || needed > res->num_entries || id >= ICE_RES_VALID_BIT) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"param err: needed=%d, num_entries = %d id=0x%04x\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"param err: needed=%d, num_entries = %d id=0x%04x\\n\",\n \t\t\tneeded, res->num_entries, id);\n \t\treturn -EINVAL;\n \t}\n@@ -2814,8 +2806,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi)\n \tstatus = ice_cfg_vsi_lan(vsi->port_info, vsi->idx, vsi->tc_cfg.ena_tc,\n \t\t\t\t max_txqs);\n \tif (status) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"VSI %d failed lan queue config, error %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"VSI %d failed lan queue config, error %d\\n\",\n \t\t\tvsi->vsi_num, status);\n \t\tif (init_vsi) {\n \t\t\tret = -EIO;\n@@ -3073,16 +3064,14 @@ int ice_set_dflt_vsi(struct ice_sw *sw, struct ice_vsi *vsi)\n \n \t/* another VSI is already the default VSI for this switch */\n \tif (ice_is_dflt_vsi_in_use(sw)) {\n-\t\tdev_err(dev,\n-\t\t\t\"Default forwarding VSI %d already in use, disable it and try again\\n\",\n+\t\tdev_err(dev, \"Default forwarding VSI %d already in use, disable it and try again\\n\",\n \t\t\tsw->dflt_vsi->vsi_num);\n \t\treturn -EEXIST;\n \t}\n \n \tstatus = ice_cfg_dflt_vsi(&vsi->back->hw, vsi->idx, true, ICE_FLTR_RX);\n \tif (status) {\n-\t\tdev_err(dev,\n-\t\t\t\"Failed to set VSI %d as the default forwarding VSI, error %d\\n\",\n+\t\tdev_err(dev, \"Failed to set VSI %d as the default forwarding VSI, error %d\\n\",\n \t\t\tvsi->vsi_num, status);\n \t\treturn -EIO;\n \t}\n@@ -3121,8 +3110,7 @@ int ice_clear_dflt_vsi(struct ice_sw *sw)\n \tstatus = ice_cfg_dflt_vsi(&dflt_vsi->back->hw, dflt_vsi->idx, false,\n \t\t\t\t ICE_FLTR_RX);\n \tif (status) {\n-\t\tdev_err(dev,\n-\t\t\t\"Failed to clear the default forwarding VSI %d, error %d\\n\",\n+\t\tdev_err(dev, \"Failed to clear the default forwarding VSI %d, error %d\\n\",\n \t\t\tdflt_vsi->vsi_num, status);\n \t\treturn -EIO;\n \t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c\nindex 3a05f9e3b86e..456c8efe49c5 100644\n--- a/drivers/net/ethernet/intel/ice/ice_main.c\n+++ b/drivers/net/ethernet/intel/ice/ice_main.c\n@@ -162,8 +162,7 @@ static int ice_init_mac_fltr(struct ice_pf *pf)\n \t * had an error\n \t */\n \tif (status && vsi->netdev->reg_state == NETREG_REGISTERED) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"Could not add MAC filters error %d. Unregistering device\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"Could not add MAC filters error %d. Unregistering device\\n\",\n \t\t\tstatus);\n \t\tunregister_netdev(vsi->netdev);\n \t\tfree_netdev(vsi->netdev);\n@@ -335,8 +334,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t !test_and_set_bit(__ICE_FLTR_OVERFLOW_PROMISC,\n \t\t\t\t vsi->state)) {\n \t\t\tpromisc_forced_on = true;\n-\t\t\tnetdev_warn(netdev,\n-\t\t\t\t \"Reached MAC filter limit, forcing promisc mode on VSI %d\\n\",\n+\t\t\tnetdev_warn(netdev, \"Reached MAC filter limit, forcing promisc mode on VSI %d\\n\",\n \t\t\t\t vsi->vsi_num);\n \t\t} else {\n \t\t\terr = -EIO;\n@@ -382,8 +380,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t\tif (!ice_is_dflt_vsi_in_use(pf->first_sw)) {\n \t\t\t\terr = ice_set_dflt_vsi(pf->first_sw, vsi);\n \t\t\t\tif (err && err != -EEXIST) {\n-\t\t\t\t\tnetdev_err(netdev,\n-\t\t\t\t\t\t \"Error %d setting default VSI %i Rx rule\\n\",\n+\t\t\t\t\tnetdev_err(netdev, \"Error %d setting default VSI %i Rx rule\\n\",\n \t\t\t\t\t\t err, vsi->vsi_num);\n \t\t\t\t\tvsi->current_netdev_flags &=\n \t\t\t\t\t\t~IFF_PROMISC;\n@@ -395,8 +392,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)\n \t\t\tif (ice_is_vsi_dflt_vsi(pf->first_sw, vsi)) {\n \t\t\t\terr = ice_clear_dflt_vsi(pf->first_sw);\n \t\t\t\tif (err) {\n-\t\t\t\t\tnetdev_err(netdev,\n-\t\t\t\t\t\t \"Error %d clearing default VSI %i Rx rule\\n\",\n+\t\t\t\t\tnetdev_err(netdev, \"Error %d clearing default VSI %i Rx rule\\n\",\n \t\t\t\t\t\t err, vsi->vsi_num);\n \t\t\t\t\tvsi->current_netdev_flags |=\n \t\t\t\t\t\tIFF_PROMISC;\n@@ -818,8 +814,7 @@ ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,\n \t */\n \tresult = ice_update_link_info(pi);\n \tif (result)\n-\t\tdev_dbg(dev,\n-\t\t\t\"Failed to update link status and re-enable link events for port %d\\n\",\n+\t\tdev_dbg(dev, \"Failed to update link status and re-enable link events for port %d\\n\",\n \t\t\tpi->lport);\n \n \t/* if the old link up/down and speed is the same as the new */\n@@ -837,8 +832,7 @@ ice_link_event(struct ice_pf *pf, struct ice_port_info *pi, bool link_up,\n \n \t\tresult = ice_aq_set_link_restart_an(pi, false, NULL);\n \t\tif (result) {\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"Failed to set link down, VSI %d error %d\\n\",\n+\t\t\tdev_dbg(dev, \"Failed to set link down, VSI %d error %d\\n\",\n \t\t\t\tvsi->vsi_num, result);\n \t\t\treturn result;\n \t\t}\n@@ -896,15 +890,13 @@ static int ice_init_link_events(struct ice_port_info *pi)\n \t\t ICE_AQ_LINK_EVENT_MODULE_QUAL_FAIL));\n \n \tif (ice_aq_set_event_mask(pi->hw, pi->lport, mask, NULL)) {\n-\t\tdev_dbg(ice_hw_to_dev(pi->hw),\n-\t\t\t\"Failed to set link event mask for port %d\\n\",\n+\t\tdev_dbg(ice_hw_to_dev(pi->hw), \"Failed to set link event mask for port %d\\n\",\n \t\t\tpi->lport);\n \t\treturn -EIO;\n \t}\n \n \tif (ice_aq_get_link_info(pi, true, NULL, NULL)) {\n-\t\tdev_dbg(ice_hw_to_dev(pi->hw),\n-\t\t\t\"Failed to enable link events for port %d\\n\",\n+\t\tdev_dbg(ice_hw_to_dev(pi->hw), \"Failed to enable link events for port %d\\n\",\n \t\t\tpi->lport);\n \t\treturn -EIO;\n \t}\n@@ -933,8 +925,8 @@ ice_handle_link_event(struct ice_pf *pf, struct ice_rq_event_info *event)\n \t\t\t\t!!(link_data->link_info & ICE_AQ_LINK_UP),\n \t\t\t\tle16_to_cpu(link_data->link_speed));\n \tif (status)\n-\t\tdev_dbg(ice_pf_to_dev(pf),\n-\t\t\t\"Could not process link event, error %d\\n\", status);\n+\t\tdev_dbg(ice_pf_to_dev(pf), \"Could not process link event, error %d\\n\",\n+\t\t\tstatus);\n \n \treturn status;\n }\n@@ -983,13 +975,11 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \t\t\tdev_dbg(dev, \"%s Receive Queue VF Error detected\\n\",\n \t\t\t\tqtype);\n \t\tif (val & PF_FW_ARQLEN_ARQOVFL_M) {\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"%s Receive Queue Overflow Error detected\\n\",\n+\t\t\tdev_dbg(dev, \"%s Receive Queue Overflow Error detected\\n\",\n \t\t\t\tqtype);\n \t\t}\n \t\tif (val & PF_FW_ARQLEN_ARQCRIT_M)\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"%s Receive Queue Critical Error detected\\n\",\n+\t\t\tdev_dbg(dev, \"%s Receive Queue Critical Error detected\\n\",\n \t\t\t\tqtype);\n \t\tval &= ~(PF_FW_ARQLEN_ARQVFE_M | PF_FW_ARQLEN_ARQOVFL_M |\n \t\t\t PF_FW_ARQLEN_ARQCRIT_M);\n@@ -1002,8 +992,8 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \t\t PF_FW_ATQLEN_ATQCRIT_M)) {\n \t\toldval = val;\n \t\tif (val & PF_FW_ATQLEN_ATQVFE_M)\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"%s Send Queue VF Error detected\\n\", qtype);\n+\t\t\tdev_dbg(dev, \"%s Send Queue VF Error detected\\n\",\n+\t\t\t\tqtype);\n \t\tif (val & PF_FW_ATQLEN_ATQOVFL_M) {\n \t\t\tdev_dbg(dev, \"%s Send Queue Overflow Error detected\\n\",\n \t\t\t\tqtype);\n@@ -1052,8 +1042,7 @@ static int __ice_clean_ctrlq(struct ice_pf *pf, enum ice_ctl_q q_type)\n \t\t\tice_dcb_process_lldp_set_mib_change(pf, &event);\n \t\t\tbreak;\n \t\tdefault:\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"%s Receive Queue unknown event 0x%04x ignored\\n\",\n+\t\t\tdev_dbg(dev, \"%s Receive Queue unknown event 0x%04x ignored\\n\",\n \t\t\t\tqtype, opcode);\n \t\t\tbreak;\n \t\t}\n@@ -1339,8 +1328,7 @@ static void ice_handle_mdd_event(struct ice_pf *pf)\n \t\t\tvf->num_mdd_events++;\n \t\t\tif (vf->num_mdd_events &&\n \t\t\t vf->num_mdd_events <= ICE_MDD_EVENTS_THRESHOLD)\n-\t\t\t\tdev_info(dev,\n-\t\t\t\t\t \"VF %d has had %llu MDD events since last boot, Admin might need to reload AVF driver with this number of events\\n\",\n+\t\t\t\tdev_info(dev, \"VF %d has had %llu MDD events since last boot, Admin might need to reload AVF driver with this number of events\\n\",\n \t\t\t\t\t i, vf->num_mdd_events);\n \t\t}\n \t}\n@@ -1382,8 +1370,7 @@ static int ice_force_phys_link_state(struct ice_vsi *vsi, bool link_up)\n \tretcode = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,\n \t\t\t\t NULL);\n \tif (retcode) {\n-\t\tdev_err(dev,\n-\t\t\t\"Failed to get phy capabilities, VSI %d error %d\\n\",\n+\t\tdev_err(dev, \"Failed to get phy capabilities, VSI %d error %d\\n\",\n \t\t\tvsi->vsi_num, retcode);\n \t\tretcode = -EIO;\n \t\tgoto out;\n@@ -1656,8 +1643,8 @@ static int ice_vsi_req_irq_msix(struct ice_vsi *vsi, char *basename)\n \t\terr = devm_request_irq(dev, irq_num, vsi->irq_handler, 0,\n \t\t\t\t q_vector->name, q_vector);\n \t\tif (err) {\n-\t\t\tnetdev_err(vsi->netdev,\n-\t\t\t\t \"MSIX request_irq failed, error: %d\\n\", err);\n+\t\t\tnetdev_err(vsi->netdev, \"MSIX request_irq failed, error: %d\\n\",\n+\t\t\t\t err);\n \t\t\tgoto free_q_irqs;\n \t\t}\n \n@@ -2785,8 +2772,7 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \t}\n \n \tif (v_actual < v_budget) {\n-\t\tdev_warn(dev,\n-\t\t\t \"not enough OS MSI-X vectors. requested = %d, obtained = %d\\n\",\n+\t\tdev_warn(dev, \"not enough OS MSI-X vectors. requested = %d, obtained = %d\\n\",\n \t\t\t v_budget, v_actual);\n /* 2 vectors for LAN and RDMA (traffic + OICR) */\n #define ICE_MIN_LAN_VECS 2\n@@ -2811,8 +2797,7 @@ static int ice_ena_msix_range(struct ice_pf *pf)\n \tgoto exit_err;\n \n no_hw_vecs_left_err:\n-\tdev_err(dev,\n-\t\t\"not enough device MSI-X vectors. requested = %d, available = %d\\n\",\n+\tdev_err(dev, \"not enough device MSI-X vectors. requested = %d, available = %d\\n\",\n \t\tneeded, v_left);\n \terr = -ERANGE;\n exit_err:\n@@ -2946,16 +2931,14 @@ ice_log_pkg_init(struct ice_hw *hw, enum ice_status *status)\n \t\t !memcmp(hw->pkg_name, hw->active_pkg_name,\n \t\t\t sizeof(hw->pkg_name))) {\n \t\t\tif (hw->pkg_dwnld_status == ICE_AQ_RC_EEXIST)\n-\t\t\t\tdev_info(dev,\n-\t\t\t\t\t \"DDP package already present on device: %s version %d.%d.%d.%d\\n\",\n+\t\t\t\tdev_info(dev, \"DDP package already present on device: %s version %d.%d.%d.%d\\n\",\n \t\t\t\t\t hw->active_pkg_name,\n \t\t\t\t\t hw->active_pkg_ver.major,\n \t\t\t\t\t hw->active_pkg_ver.minor,\n \t\t\t\t\t hw->active_pkg_ver.update,\n \t\t\t\t\t hw->active_pkg_ver.draft);\n \t\t\telse\n-\t\t\t\tdev_info(dev,\n-\t\t\t\t\t \"The DDP package was successfully loaded: %s version %d.%d.%d.%d\\n\",\n+\t\t\t\tdev_info(dev, \"The DDP package was successfully loaded: %s version %d.%d.%d.%d\\n\",\n \t\t\t\t\t hw->active_pkg_name,\n \t\t\t\t\t hw->active_pkg_ver.major,\n \t\t\t\t\t hw->active_pkg_ver.minor,\n@@ -2963,8 +2946,7 @@ ice_log_pkg_init(struct ice_hw *hw, enum ice_status *status)\n \t\t\t\t\t hw->active_pkg_ver.draft);\n \t\t} else if (hw->active_pkg_ver.major != ICE_PKG_SUPP_VER_MAJ ||\n \t\t\t hw->active_pkg_ver.minor != ICE_PKG_SUPP_VER_MNR) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"The device has a DDP package that is not supported by the driver. The device has package '%s' version %d.%d.x.x. The driver requires version %d.%d.x.x. Entering Safe Mode.\\n\",\n+\t\t\tdev_err(dev, \"The device has a DDP package that is not supported by the driver. The device has package '%s' version %d.%d.x.x. The driver requires version %d.%d.x.x. Entering Safe Mode.\\n\",\n \t\t\t\thw->active_pkg_name,\n \t\t\t\thw->active_pkg_ver.major,\n \t\t\t\thw->active_pkg_ver.minor,\n@@ -2972,8 +2954,7 @@ ice_log_pkg_init(struct ice_hw *hw, enum ice_status *status)\n \t\t\t*status = ICE_ERR_NOT_SUPPORTED;\n \t\t} else if (hw->active_pkg_ver.major == ICE_PKG_SUPP_VER_MAJ &&\n \t\t\t hw->active_pkg_ver.minor == ICE_PKG_SUPP_VER_MNR) {\n-\t\t\tdev_info(dev,\n-\t\t\t\t \"The driver could not load the DDP package file because a compatible DDP package is already present on the device. The device has package '%s' version %d.%d.%d.%d. The package file found by the driver: '%s' version %d.%d.%d.%d.\\n\",\n+\t\t\tdev_info(dev, \"The driver could not load the DDP package file because a compatible DDP package is already present on the device. The device has package '%s' version %d.%d.%d.%d. The package file found by the driver: '%s' version %d.%d.%d.%d.\\n\",\n \t\t\t\t hw->active_pkg_name,\n \t\t\t\t hw->active_pkg_ver.major,\n \t\t\t\t hw->active_pkg_ver.minor,\n@@ -2985,54 +2966,46 @@ ice_log_pkg_init(struct ice_hw *hw, enum ice_status *status)\n \t\t\t\t hw->pkg_ver.update,\n \t\t\t\t hw->pkg_ver.draft);\n \t\t} else {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"An unknown error occurred when loading the DDP package, please reboot the system. If the problem persists, update the NVM. Entering Safe Mode.\\n\");\n+\t\t\tdev_err(dev, \"An unknown error occurred when loading the DDP package, please reboot the system. If the problem persists, update the NVM. Entering Safe Mode.\\n\");\n \t\t\t*status = ICE_ERR_NOT_SUPPORTED;\n \t\t}\n \t\tbreak;\n \tcase ICE_ERR_BUF_TOO_SHORT:\n \t\t/* fall-through */\n \tcase ICE_ERR_CFG:\n-\t\tdev_err(dev,\n-\t\t\t\"The DDP package file is invalid. Entering Safe Mode.\\n\");\n+\t\tdev_err(dev, \"The DDP package file is invalid. Entering Safe Mode.\\n\");\n \t\tbreak;\n \tcase ICE_ERR_NOT_SUPPORTED:\n \t\t/* Package File version not supported */\n \t\tif (hw->pkg_ver.major > ICE_PKG_SUPP_VER_MAJ ||\n \t\t (hw->pkg_ver.major == ICE_PKG_SUPP_VER_MAJ &&\n \t\t hw->pkg_ver.minor > ICE_PKG_SUPP_VER_MNR))\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"The DDP package file version is higher than the driver supports. Please use an updated driver. Entering Safe Mode.\\n\");\n+\t\t\tdev_err(dev, \"The DDP package file version is higher than the driver supports. Please use an updated driver. Entering Safe Mode.\\n\");\n \t\telse if (hw->pkg_ver.major < ICE_PKG_SUPP_VER_MAJ ||\n \t\t\t (hw->pkg_ver.major == ICE_PKG_SUPP_VER_MAJ &&\n \t\t\t hw->pkg_ver.minor < ICE_PKG_SUPP_VER_MNR))\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"The DDP package file version is lower than the driver supports. The driver requires version %d.%d.x.x. Please use an updated DDP Package file. Entering Safe Mode.\\n\",\n+\t\t\tdev_err(dev, \"The DDP package file version is lower than the driver supports. The driver requires version %d.%d.x.x. Please use an updated DDP Package file. Entering Safe Mode.\\n\",\n \t\t\t\tICE_PKG_SUPP_VER_MAJ, ICE_PKG_SUPP_VER_MNR);\n \t\tbreak;\n \tcase ICE_ERR_AQ_ERROR:\n \t\tswitch (hw->pkg_dwnld_status) {\n \t\tcase ICE_AQ_RC_ENOSEC:\n \t\tcase ICE_AQ_RC_EBADSIG:\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"The DDP package could not be loaded because its signature is not valid. Please use a valid DDP Package. Entering Safe Mode.\\n\");\n+\t\t\tdev_err(dev, \"The DDP package could not be loaded because its signature is not valid. Please use a valid DDP Package. Entering Safe Mode.\\n\");\n \t\t\treturn;\n \t\tcase ICE_AQ_RC_ESVN:\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"The DDP Package could not be loaded because its security revision is too low. Please use an updated DDP Package. Entering Safe Mode.\\n\");\n+\t\t\tdev_err(dev, \"The DDP Package could not be loaded because its security revision is too low. Please use an updated DDP Package. Entering Safe Mode.\\n\");\n \t\t\treturn;\n \t\tcase ICE_AQ_RC_EBADMAN:\n \t\tcase ICE_AQ_RC_EBADBUF:\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"An error occurred on the device while loading the DDP package. The device will be reset.\\n\");\n+\t\t\tdev_err(dev, \"An error occurred on the device while loading the DDP package. The device will be reset.\\n\");\n \t\t\treturn;\n \t\tdefault:\n \t\t\tbreak;\n \t\t}\n \t\t/* fall-through */\n \tdefault:\n-\t\tdev_err(dev,\n-\t\t\t\"An unknown error (%d) occurred when loading the DDP package. Entering Safe Mode.\\n\",\n+\t\tdev_err(dev, \"An unknown error (%d) occurred when loading the DDP package. Entering Safe Mode.\\n\",\n \t\t\t*status);\n \t\tbreak;\n \t}\n@@ -3063,8 +3036,7 @@ ice_load_pkg(const struct firmware *firmware, struct ice_pf *pf)\n \t\tstatus = ice_init_pkg(hw, hw->pkg_copy, hw->pkg_size);\n \t\tice_log_pkg_init(hw, &status);\n \t} else {\n-\t\tdev_err(dev,\n-\t\t\t\"The DDP package file failed to load. Entering Safe Mode.\\n\");\n+\t\tdev_err(dev, \"The DDP package file failed to load. Entering Safe Mode.\\n\");\n \t}\n \n \tif (status) {\n@@ -3090,8 +3062,7 @@ ice_load_pkg(const struct firmware *firmware, struct ice_pf *pf)\n static void ice_verify_cacheline_size(struct ice_pf *pf)\n {\n \tif (rd32(&pf->hw, GLPCI_CNF2) & GLPCI_CNF2_CACHELINE_SIZE_M)\n-\t\tdev_warn(ice_pf_to_dev(pf),\n-\t\t\t \"%d Byte cache line assumption is invalid, driver may have Tx timeouts!\\n\",\n+\t\tdev_warn(ice_pf_to_dev(pf), \"%d Byte cache line assumption is invalid, driver may have Tx timeouts!\\n\",\n \t\t\t ICE_CACHE_LINE_BYTES);\n }\n \n@@ -3184,8 +3155,7 @@ static void ice_request_fw(struct ice_pf *pf)\n dflt_pkg_load:\n \terr = request_firmware(&firmware, ICE_DDP_PKG_FILE, dev);\n \tif (err) {\n-\t\tdev_err(dev,\n-\t\t\t\"The DDP package file was not found or could not be read. Entering Safe Mode\\n\");\n+\t\tdev_err(dev, \"The DDP package file was not found or could not be read. Entering Safe Mode\\n\");\n \t\treturn;\n \t}\n \n@@ -3277,8 +3247,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t * true\n \t */\n \tif (ice_is_safe_mode(pf)) {\n-\t\tdev_err(dev,\n-\t\t\t\"Package download failed. Advanced features disabled - Device now in Safe Mode\\n\");\n+\t\tdev_err(dev, \"Package download failed. Advanced features disabled - Device now in Safe Mode\\n\");\n \t\t/* we already got function/device capabilities but these don't\n \t\t * reflect what the driver needs to do in safe mode. Instead of\n \t\t * adding conditional logic everywhere to ignore these\n@@ -3355,8 +3324,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)\n \t/* tell the firmware we are up */\n \terr = ice_send_version(pf);\n \tif (err) {\n-\t\tdev_err(dev,\n-\t\t\t\"probe failed sending driver version %s. error: %d\\n\",\n+\t\tdev_err(dev, \"probe failed sending driver version %s. error: %d\\n\",\n \t\t\tice_drv_ver, err);\n \t\tgoto err_alloc_sw_unroll;\n \t}\n@@ -3534,8 +3502,7 @@ static pci_ers_result_t ice_pci_err_slot_reset(struct pci_dev *pdev)\n \n \terr = pci_enable_device_mem(pdev);\n \tif (err) {\n-\t\tdev_err(&pdev->dev,\n-\t\t\t\"Cannot re-enable PCI device after reset, error %d\\n\",\n+\t\tdev_err(&pdev->dev, \"Cannot re-enable PCI device after reset, error %d\\n\",\n \t\t\terr);\n \t\tresult = PCI_ERS_RESULT_DISCONNECT;\n \t} else {\n@@ -3554,8 +3521,7 @@ static pci_ers_result_t ice_pci_err_slot_reset(struct pci_dev *pdev)\n \n \terr = pci_cleanup_aer_uncorrect_error_status(pdev);\n \tif (err)\n-\t\tdev_dbg(&pdev->dev,\n-\t\t\t\"pci_cleanup_aer_uncorrect_error_status failed, error %d\\n\",\n+\t\tdev_dbg(&pdev->dev, \"pci_cleanup_aer_uncorrect_error_status failed, error %d\\n\",\n \t\t\terr);\n \t\t/* non-fatal, continue */\n \n@@ -3574,8 +3540,8 @@ static void ice_pci_err_resume(struct pci_dev *pdev)\n \tstruct ice_pf *pf = pci_get_drvdata(pdev);\n \n \tif (!pf) {\n-\t\tdev_err(&pdev->dev,\n-\t\t\t\"%s failed, device is unrecoverable\\n\", __func__);\n+\t\tdev_err(&pdev->dev, \"%s failed, device is unrecoverable\\n\",\n+\t\t\t__func__);\n \t\treturn;\n \t}\n \n@@ -3823,8 +3789,7 @@ ice_set_tx_maxrate(struct net_device *netdev, int queue_index, u32 maxrate)\n \n \t/* Validate maxrate requested is within permitted range */\n \tif (maxrate && (maxrate > (ICE_SCHED_MAX_BW / 1000))) {\n-\t\tnetdev_err(netdev,\n-\t\t\t \"Invalid max rate %d specified for the queue %d\\n\",\n+\t\tnetdev_err(netdev, \"Invalid max rate %d specified for the queue %d\\n\",\n \t\t\t maxrate, queue_index);\n \t\treturn -EINVAL;\n \t}\n@@ -3840,8 +3805,8 @@ ice_set_tx_maxrate(struct net_device *netdev, int queue_index, u32 maxrate)\n \t\tstatus = ice_cfg_q_bw_lmt(vsi->port_info, vsi->idx, tc,\n \t\t\t\t\t q_handle, ICE_MAX_BW, maxrate * 1000);\n \tif (status) {\n-\t\tnetdev_err(netdev,\n-\t\t\t \"Unable to set Tx max rate, error %d\\n\", status);\n+\t\tnetdev_err(netdev, \"Unable to set Tx max rate, error %d\\n\",\n+\t\t\t status);\n \t\treturn -EIO;\n \t}\n \n@@ -3933,15 +3898,13 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)\n \n \t/* Don't set any netdev advanced features with device in Safe Mode */\n \tif (ice_is_safe_mode(vsi->back)) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Device is in Safe Mode - not enabling advanced netdev features\\n\");\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"Device is in Safe Mode - not enabling advanced netdev features\\n\");\n \t\treturn ret;\n \t}\n \n \t/* Do not change setting during reset */\n \tif (ice_is_reset_in_progress(pf->state)) {\n-\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\"Device is resetting, changing advanced netdev features temporarily unavailable.\\n\");\n+\t\tdev_err(ice_pf_to_dev(vsi->back), \"Device is resetting, changing advanced netdev features temporarily unavailable.\\n\");\n \t\treturn -EBUSY;\n \t}\n \n@@ -4429,21 +4392,18 @@ int ice_down(struct ice_vsi *vsi)\n \n \ttx_err = ice_vsi_stop_lan_tx_rings(vsi, ICE_NO_RESET, 0);\n \tif (tx_err)\n-\t\tnetdev_err(vsi->netdev,\n-\t\t\t \"Failed stop Tx rings, VSI %d error %d\\n\",\n+\t\tnetdev_err(vsi->netdev, \"Failed stop Tx rings, VSI %d error %d\\n\",\n \t\t\t vsi->vsi_num, tx_err);\n \tif (!tx_err && ice_is_xdp_ena_vsi(vsi)) {\n \t\ttx_err = ice_vsi_stop_xdp_tx_rings(vsi);\n \t\tif (tx_err)\n-\t\t\tnetdev_err(vsi->netdev,\n-\t\t\t\t \"Failed stop XDP rings, VSI %d error %d\\n\",\n+\t\t\tnetdev_err(vsi->netdev, \"Failed stop XDP rings, VSI %d error %d\\n\",\n \t\t\t\t vsi->vsi_num, tx_err);\n \t}\n \n \trx_err = ice_vsi_stop_rx_rings(vsi);\n \tif (rx_err)\n-\t\tnetdev_err(vsi->netdev,\n-\t\t\t \"Failed stop Rx rings, VSI %d error %d\\n\",\n+\t\tnetdev_err(vsi->netdev, \"Failed stop Rx rings, VSI %d error %d\\n\",\n \t\t\t vsi->vsi_num, rx_err);\n \n \tice_napi_disable_all(vsi);\n@@ -4451,8 +4411,7 @@ int ice_down(struct ice_vsi *vsi)\n \tif (test_bit(ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA, vsi->back->flags)) {\n \t\tlink_err = ice_force_phys_link_state(vsi, false);\n \t\tif (link_err)\n-\t\t\tnetdev_err(vsi->netdev,\n-\t\t\t\t \"Failed to set physical link down, VSI %d error %d\\n\",\n+\t\t\tnetdev_err(vsi->netdev, \"Failed to set physical link down, VSI %d error %d\\n\",\n \t\t\t\t vsi->vsi_num, link_err);\n \t}\n \n@@ -4463,8 +4422,7 @@ int ice_down(struct ice_vsi *vsi)\n \t\tice_clean_rx_ring(vsi->rx_rings[i]);\n \n \tif (tx_err || rx_err || link_err) {\n-\t\tnetdev_err(vsi->netdev,\n-\t\t\t \"Failed to close VSI 0x%04X on switch 0x%04X\\n\",\n+\t\tnetdev_err(vsi->netdev, \"Failed to close VSI 0x%04X on switch 0x%04X\\n\",\n \t\t\t vsi->vsi_num, vsi->vsw->sw_id);\n \t\treturn -EIO;\n \t}\n@@ -4611,8 +4569,7 @@ static void ice_vsi_release_all(struct ice_pf *pf)\n \n \t\terr = ice_vsi_release(pf->vsi[i]);\n \t\tif (err)\n-\t\t\tdev_dbg(ice_pf_to_dev(pf),\n-\t\t\t\t\"Failed to release pf->vsi[%d], err %d, vsi_num = %d\\n\",\n+\t\t\tdev_dbg(ice_pf_to_dev(pf), \"Failed to release pf->vsi[%d], err %d, vsi_num = %d\\n\",\n \t\t\t\ti, err, pf->vsi[i]->vsi_num);\n \t}\n }\n@@ -4639,8 +4596,7 @@ static int ice_vsi_rebuild_by_type(struct ice_pf *pf, enum ice_vsi_type type)\n \t\t/* rebuild the VSI */\n \t\terr = ice_vsi_rebuild(vsi, true);\n \t\tif (err) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"rebuild VSI failed, err %d, VSI index %d, type %s\\n\",\n+\t\t\tdev_err(dev, \"rebuild VSI failed, err %d, VSI index %d, type %s\\n\",\n \t\t\t\terr, vsi->idx, ice_vsi_type_str(type));\n \t\t\treturn err;\n \t\t}\n@@ -4648,8 +4604,7 @@ static int ice_vsi_rebuild_by_type(struct ice_pf *pf, enum ice_vsi_type type)\n \t\t/* replay filters for the VSI */\n \t\tstatus = ice_replay_vsi(&pf->hw, vsi->idx);\n \t\tif (status) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"replay VSI failed, status %d, VSI index %d, type %s\\n\",\n+\t\t\tdev_err(dev, \"replay VSI failed, status %d, VSI index %d, type %s\\n\",\n \t\t\t\tstatus, vsi->idx, ice_vsi_type_str(type));\n \t\t\treturn -EIO;\n \t\t}\n@@ -4662,8 +4617,7 @@ static int ice_vsi_rebuild_by_type(struct ice_pf *pf, enum ice_vsi_type type)\n \t\t/* enable the VSI */\n \t\terr = ice_ena_vsi(vsi, false);\n \t\tif (err) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"enable VSI failed, err %d, VSI index %d, type %s\\n\",\n+\t\t\tdev_err(dev, \"enable VSI failed, err %d, VSI index %d, type %s\\n\",\n \t\t\t\terr, vsi->idx, ice_vsi_type_str(type));\n \t\t\treturn err;\n \t\t}\n@@ -4741,8 +4695,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \t}\n \n \tif (pf->first_sw->dflt_vsi_ena)\n-\t\tdev_info(dev,\n-\t\t\t \"Clearing default VSI, re-enable after reset completes\\n\");\n+\t\tdev_info(dev, \"Clearing default VSI, re-enable after reset completes\\n\");\n \t/* clear the default VSI configuration if it exists */\n \tpf->first_sw->dflt_vsi = NULL;\n \tpf->first_sw->dflt_vsi_ena = false;\n@@ -4801,8 +4754,7 @@ static void ice_rebuild(struct ice_pf *pf, enum ice_reset_req reset_type)\n \t/* tell the firmware we are up */\n \tret = ice_send_version(pf);\n \tif (ret) {\n-\t\tdev_err(dev,\n-\t\t\t\"Rebuild failed due to error sending driver version: %d\\n\",\n+\t\tdev_err(dev, \"Rebuild failed due to error sending driver version: %d\\n\",\n \t\t\tret);\n \t\tgoto err_vsi_rebuild;\n \t}\n@@ -5265,8 +5217,7 @@ int ice_open(struct net_device *netdev)\n \tif (pi->phy.link_info.link_info & ICE_AQ_MEDIA_AVAILABLE) {\n \t\terr = ice_force_phys_link_state(vsi, true);\n \t\tif (err) {\n-\t\t\tnetdev_err(netdev,\n-\t\t\t\t \"Failed to set physical link up, error %d\\n\",\n+\t\t\tnetdev_err(netdev, \"Failed to set physical link up, error %d\\n\",\n \t\t\t\t err);\n \t\t\treturn err;\n \t\t}\ndiff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\nindex a287068c5274..6d78bcdd162d 100644\n--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c\n@@ -199,8 +199,7 @@ static void ice_dis_vf_mappings(struct ice_vf *vf)\n \tif (vsi->rx_mapping_mode == ICE_VSI_MAP_CONTIG)\n \t\twr32(hw, VPLAN_RX_QBASE(vf->vf_id), 0);\n \telse\n-\t\tdev_err(dev,\n-\t\t\t\"Scattered mode for VF Rx queues is not yet implemented\\n\");\n+\t\tdev_err(dev, \"Scattered mode for VF Rx queues is not yet implemented\\n\");\n }\n \n /**\n@@ -402,8 +401,7 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr, bool is_pfr)\n \t\tif ((reg & VF_TRANS_PENDING_M) == 0)\n \t\t\tbreak;\n \n-\t\tdev_err(dev,\n-\t\t\t\"VF %d PCI transactions stuck\\n\", vf->vf_id);\n+\t\tdev_err(dev, \"VF %d PCI transactions stuck\\n\", vf->vf_id);\n \t\tudelay(ICE_PCI_CIAD_WAIT_DELAY_US);\n \t}\n }\n@@ -1528,8 +1526,7 @@ ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,\n \t\tdev_info(dev, \"VF %d failed opcode %d, retval: %d\\n\", vf->vf_id,\n \t\t\t v_opcode, v_retval);\n \t\tif (vf->num_inval_msgs > ICE_DFLT_NUM_INVAL_MSGS_ALLOWED) {\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"Number of invalid messages exceeded for VF %d\\n\",\n+\t\t\tdev_err(dev, \"Number of invalid messages exceeded for VF %d\\n\",\n \t\t\t\tvf->vf_id);\n \t\t\tdev_err(dev, \"Use PF Control I/F to enable the VF\\n\");\n \t\t\tset_bit(ICE_VF_STATE_DIS, vf->vf_states);\n@@ -1544,8 +1541,7 @@ ice_vc_send_msg_to_vf(struct ice_vf *vf, u32 v_opcode,\n \taq_ret = ice_aq_send_msg_to_vf(&pf->hw, vf->vf_id, v_opcode, v_retval,\n \t\t\t\t msg, msglen, NULL);\n \tif (aq_ret && pf->hw.mailboxq.sq_last_status != ICE_AQ_RC_ENOSYS) {\n-\t\tdev_info(dev,\n-\t\t\t \"Unable to send the message to VF %d ret %d aq_err %d\\n\",\n+\t\tdev_info(dev, \"Unable to send the message to VF %d ret %d aq_err %d\\n\",\n \t\t\t vf->vf_id, aq_ret, pf->hw.mailboxq.sq_last_status);\n \t\treturn -EIO;\n \t}\n@@ -1889,8 +1885,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)\n \t}\n \n \tif (vf_vsi->type != ICE_VSI_VF) {\n-\t\tnetdev_err(netdev,\n-\t\t\t \"Type %d of VSI %d for VF %d is no ICE_VSI_VF\\n\",\n+\t\tnetdev_err(netdev, \"Type %d of VSI %d for VF %d is no ICE_VSI_VF\\n\",\n \t\t\t vf_vsi->type, vf_vsi->vsi_num, vf->vf_id);\n \t\treturn -ENODEV;\n \t}\n@@ -1920,8 +1915,7 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)\n \n \tstatus = ice_update_vsi(&pf->hw, vf_vsi->idx, ctx, NULL);\n \tif (status) {\n-\t\tdev_err(dev,\n-\t\t\t\"Failed to %sable spoofchk on VF %d VSI %d\\n error %d\",\n+\t\tdev_err(dev, \"Failed to %sable spoofchk on VF %d VSI %d\\n error %d\",\n \t\t\tena ? \"en\" : \"dis\", vf->vf_id, vf_vsi->vsi_num, status);\n \t\tret = -EIO;\n \t\tgoto out;\n@@ -2038,8 +2032,7 @@ static int ice_vc_ena_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t\tcontinue;\n \n \t\tif (ice_vsi_ctrl_rx_ring(vsi, true, vf_q_id)) {\n-\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\t\"Failed to enable Rx ring %d on VSI %d\\n\",\n+\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to enable Rx ring %d on VSI %d\\n\",\n \t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\tgoto error_param;\n@@ -2141,8 +2134,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \n \t\t\tif (ice_vsi_stop_tx_ring(vsi, ICE_NO_RESET, vf->vf_id,\n \t\t\t\t\t\t ring, &txq_meta)) {\n-\t\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\t\t\"Failed to stop Tx ring %d on VSI %d\\n\",\n+\t\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to stop Tx ring %d on VSI %d\\n\",\n \t\t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\t\tgoto error_param;\n@@ -2168,8 +2160,7 @@ static int ice_vc_dis_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\t\t\tcontinue;\n \n \t\t\tif (ice_vsi_ctrl_rx_ring(vsi, false, vf_q_id)) {\n-\t\t\t\tdev_err(ice_pf_to_dev(vsi->back),\n-\t\t\t\t\t\"Failed to stop Rx ring %d on VSI %d\\n\",\n+\t\t\t\tdev_err(ice_pf_to_dev(vsi->back), \"Failed to stop Rx ring %d on VSI %d\\n\",\n \t\t\t\t\tvf_q_id, vsi->vsi_num);\n \t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\t\t\tgoto error_param;\n@@ -2332,8 +2323,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)\n \n \tif (qci->num_queue_pairs > ICE_MAX_BASE_QS_PER_VF ||\n \t qci->num_queue_pairs > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"VF-%d requesting more than supported number of queues: %d\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"VF-%d requesting more than supported number of queues: %d\\n\",\n \t\t\tvf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto error_param;\n@@ -2545,8 +2535,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)\n \t */\n \tif (set && !ice_is_vf_trusted(vf) &&\n \t (vf->num_mac + al->num_elements) > ICE_MAX_MACADDR_PER_VF) {\n-\t\tdev_err(ice_pf_to_dev(pf),\n-\t\t\t\"Can't add more MAC addresses, because VF-%d is not trusted, switch the VF to trusted mode in order to add more functionalities\\n\",\n+\t\tdev_err(ice_pf_to_dev(pf), \"Can't add more MAC addresses, because VF-%d is not trusted, switch the VF to trusted mode in order to add more functionalities\\n\",\n \t\t\tvf->vf_id);\n \t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n \t\tgoto handle_mac_exit;\n@@ -2645,8 +2634,7 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)\n \t\tvfres->num_queue_pairs = ICE_MAX_BASE_QS_PER_VF;\n \t} else if (req_queues > cur_queues &&\n \t\t req_queues - cur_queues > tx_rx_queue_left) {\n-\t\tdev_warn(dev,\n-\t\t\t \"VF %d requested %u more queues, but only %u left.\\n\",\n+\t\tdev_warn(dev, \"VF %d requested %u more queues, but only %u left.\\n\",\n \t\t\t vf->vf_id, req_queues - cur_queues, tx_rx_queue_left);\n \t\tvfres->num_queue_pairs = min_t(u16, max_allowed_vf_queues,\n \t\t\t\t\t ICE_MAX_BASE_QS_PER_VF);\n@@ -2796,8 +2784,8 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \tfor (i = 0; i < vfl->num_elements; i++) {\n \t\tif (vfl->vlan_id[i] > ICE_MAX_VLANID) {\n \t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"invalid VF VLAN id %d\\n\", vfl->vlan_id[i]);\n+\t\t\tdev_err(dev, \"invalid VF VLAN id %d\\n\",\n+\t\t\t\tvfl->vlan_id[i]);\n \t\t\tgoto error_param;\n \t\t}\n \t}\n@@ -2811,8 +2799,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \n \tif (add_v && !ice_is_vf_trusted(vf) &&\n \t vsi->num_vlan >= ICE_MAX_VLAN_PER_VF) {\n-\t\tdev_info(dev,\n-\t\t\t \"VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\\n\",\n+\t\tdev_info(dev, \"VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\\n\",\n \t\t\t vf->vf_id);\n \t\t/* There is no need to let VF know about being not trusted,\n \t\t * so we can just return success message here\n@@ -2835,8 +2822,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \n \t\t\tif (!ice_is_vf_trusted(vf) &&\n \t\t\t vsi->num_vlan >= ICE_MAX_VLAN_PER_VF) {\n-\t\t\t\tdev_info(dev,\n-\t\t\t\t\t \"VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\\n\",\n+\t\t\t\tdev_info(dev, \"VF-%d is not trusted, switch the VF to trusted mode, in order to add more VLAN addresses\\n\",\n \t\t\t\t\t vf->vf_id);\n \t\t\t\t/* There is no need to let VF know about being\n \t\t\t\t * not trusted, so we can just return success\n@@ -2864,8 +2850,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t\t\t\tstatus = ice_cfg_vlan_pruning(vsi, true, false);\n \t\t\t\tif (status) {\n \t\t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n-\t\t\t\t\tdev_err(dev,\n-\t\t\t\t\t\t\"Enable VLAN pruning on VLAN ID: %d failed error-%d\\n\",\n+\t\t\t\t\tdev_err(dev, \"Enable VLAN pruning on VLAN ID: %d failed error-%d\\n\",\n \t\t\t\t\t\tvid, status);\n \t\t\t\t\tgoto error_param;\n \t\t\t\t}\n@@ -2878,8 +2863,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)\n \t\t\t\t\t\t\t promisc_m, vid);\n \t\t\t\tif (status) {\n \t\t\t\t\tv_ret = VIRTCHNL_STATUS_ERR_PARAM;\n-\t\t\t\t\tdev_err(dev,\n-\t\t\t\t\t\t\"Enable Unicast/multicast promiscuous mode on VLAN ID:%d failed error-%d\\n\",\n+\t\t\t\t\tdev_err(dev, \"Enable Unicast/multicast promiscuous mode on VLAN ID:%d failed error-%d\\n\",\n \t\t\t\t\t\tvid, status);\n \t\t\t\t}\n \t\t\t}\n@@ -3146,8 +3130,7 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event)\n \tcase VIRTCHNL_OP_GET_VF_RESOURCES:\n \t\terr = ice_vc_get_vf_res_msg(vf, msg);\n \t\tif (ice_vf_init_vlan_stripping(vf))\n-\t\t\tdev_err(dev,\n-\t\t\t\t\"Failed to initialize VLAN stripping for VF %d\\n\",\n+\t\t\tdev_err(dev, \"Failed to initialize VLAN stripping for VF %d\\n\",\n \t\t\t\tvf->vf_id);\n \t\tice_vc_notify_vf_link_state(vf);\n \t\tbreak;\n@@ -3322,8 +3305,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n \t */\n \tether_addr_copy(vf->dflt_lan_addr.addr, mac);\n \tvf->pf_set_mac = true;\n-\tnetdev_info(netdev,\n-\t\t \"MAC on VF %d set to %pM. VF driver will be reinitialized\\n\",\n+\tnetdev_info(netdev, \"MAC on VF %d set to %pM. VF driver will be reinitialized\\n\",\n \t\t vf_id, mac);\n \n \tice_vc_reset_vf(vf);\n@@ -3341,10 +3323,8 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)\n int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)\n {\n \tstruct ice_pf *pf = ice_netdev_to_pf(netdev);\n-\tstruct device *dev;\n \tstruct ice_vf *vf;\n \n-\tdev = ice_pf_to_dev(pf);\n \tif (ice_validate_vf_id(pf, vf_id))\n \t\treturn -EINVAL;\n \n@@ -3367,7 +3347,7 @@ int ice_set_vf_trust(struct net_device *netdev, int vf_id, bool trusted)\n \n \tvf->trusted = trusted;\n \tice_vc_reset_vf(vf);\n-\tdev_info(dev, \"VF %u is now %strusted\\n\",\n+\tdev_info(ice_pf_to_dev(pf), \"VF %u is now %strusted\\n\",\n \t\t vf_id, trusted ? \"\" : \"un\");\n \n \treturn 0;\ndiff --git a/drivers/net/ethernet/intel/ice/ice_xsk.c b/drivers/net/ethernet/intel/ice/ice_xsk.c\nindex 149dca0012ba..4d3407bbd4c4 100644\n--- a/drivers/net/ethernet/intel/ice/ice_xsk.c\n+++ b/drivers/net/ethernet/intel/ice/ice_xsk.c\n@@ -338,8 +338,8 @@ static int ice_xsk_umem_dma_map(struct ice_vsi *vsi, struct xdp_umem *umem)\n \t\t\t\t\t\t DMA_BIDIRECTIONAL,\n \t\t\t\t\t\t ICE_RX_DMA_ATTR);\n \t\tif (dma_mapping_error(dev, dma)) {\n-\t\t\tdev_dbg(dev,\n-\t\t\t\t\"XSK UMEM DMA mapping error on page num %d\", i);\n+\t\t\tdev_dbg(dev, \"XSK UMEM DMA mapping error on page num %d\\n\",\n+\t\t\t\ti);\n \t\t\tgoto out_unmap;\n \t\t}\n \n", "prefixes": [ "S37", "12/15" ] }