Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/970177/?format=api
{ "id": 970177, "url": "http://patchwork.ozlabs.org/api/patches/970177/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20180915003757.169108-5-jesse.brandeburg@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": "<20180915003757.169108-5-jesse.brandeburg@intel.com>", "list_archive_url": null, "date": "2018-09-15T00:37:47", "name": "[net-next,v2,04/14] iavf: rename i40e_status to iavf_status", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "330f8165c0944528d4b390a2829ec760dabf5273", "submitter": { "id": 189, "url": "http://patchwork.ozlabs.org/api/people/189/?format=api", "name": "Jesse Brandeburg", "email": "jesse.brandeburg@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/20180915003757.169108-5-jesse.brandeburg@intel.com/mbox/", "series": [ { "id": 65816, "url": "http://patchwork.ozlabs.org/api/series/65816/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=65816", "date": "2018-09-15T00:37:43", "name": "[net-next,v2,01/14] intel-ethernet: rename i40evf to iavf", "version": 2, "mbox": "http://patchwork.ozlabs.org/series/65816/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/970177/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/970177/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.138; helo=whitealder.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 whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\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 42Btm02wyYz9sBJ\n\tfor <incoming@patchwork.ozlabs.org>;\n\tSat, 15 Sep 2018 10:38:24 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id CF5F688651;\n\tSat, 15 Sep 2018 00:38:22 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id lVnfLVEIn1ud; Sat, 15 Sep 2018 00:38:11 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id BBC5688684;\n\tSat, 15 Sep 2018 00:38:11 +0000 (UTC)", "from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138])\n\tby ash.osuosl.org (Postfix) with ESMTP id 412B51C2E93\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:08 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby whitealder.osuosl.org (Postfix) with ESMTP id 3B1668867A\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:38:08 +0000 (UTC)", "from whitealder.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id fGi9YBQVS9ed for <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n\tby whitealder.osuosl.org (Postfix) with ESMTPS id 36A5E88651\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tSat, 15 Sep 2018 00:37:59 +0000 (UTC)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t14 Sep 2018 17:37:58 -0700", "from jfsjbrandeb002.jf.intel.com ([10.166.241.63])\n\tby fmsmga001.fm.intel.com with ESMTP; 14 Sep 2018 17:37:58 -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.53,375,1531810800\"; d=\"scan'208\";a=\"90189553\"", "From": "Jesse Brandeburg <jesse.brandeburg@intel.com>", "To": "netdev@vger.kernel.org,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Fri, 14 Sep 2018 17:37:47 -0700", "Message-Id": "<20180915003757.169108-5-jesse.brandeburg@intel.com>", "X-Mailer": "git-send-email 2.14.4", "In-Reply-To": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "References": "<20180915003757.169108-1-jesse.brandeburg@intel.com>", "Subject": "[Intel-wired-lan] [PATCH net-next v2 04/14] iavf: rename\n\ti40e_status to iavf_status", "X-BeenThere": "intel-wired-lan@osuosl.org", "X-Mailman-Version": "2.1.24", "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": "This is just a rename of an internal variable i40e_status, but\nit was a pretty big change and so deserved it's own patch.\n\nSigned-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>\n---\n drivers/net/ethernet/intel/iavf/i40e_adminq.c | 94 +++++++++---------\n drivers/net/ethernet/intel/iavf/i40e_alloc.h | 8 +-\n drivers/net/ethernet/intel/iavf/i40e_common.c | 72 +++++++-------\n drivers/net/ethernet/intel/iavf/i40e_osdep.h | 2 +-\n drivers/net/ethernet/intel/iavf/i40e_prototype.h | 28 +++---\n drivers/net/ethernet/intel/iavf/i40evf.h | 2 +-\n drivers/net/ethernet/intel/iavf/i40evf_client.c | 6 +-\n drivers/net/ethernet/intel/iavf/i40evf_ethtool.c | 52 ++++------\n drivers/net/ethernet/intel/iavf/i40evf_main.c | 14 +--\n drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c | 115 +++++++++-------------\n 10 files changed, 179 insertions(+), 214 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/i40e_adminq.c b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\nindex 3d1c874f5f85..f0e6f9bbb819 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_adminq.c\n@@ -34,9 +34,9 @@ static void i40e_adminq_init_regs(struct i40e_hw *hw)\n * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings\n * @hw: pointer to the hardware structure\n **/\n-static i40e_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tiavf_status ret_code;\n \n \tret_code = i40e_allocate_dma_mem(hw, &hw->aq.asq.desc_buf,\n \t\t\t\t\t i40e_mem_atq_ring,\n@@ -61,9 +61,9 @@ static i40e_status i40e_alloc_adminq_asq_ring(struct i40e_hw *hw)\n * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings\n * @hw: pointer to the hardware structure\n **/\n-static i40e_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_adminq_arq_ring(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tiavf_status ret_code;\n \n \tret_code = i40e_allocate_dma_mem(hw, &hw->aq.arq.desc_buf,\n \t\t\t\t\t i40e_mem_arq_ring,\n@@ -102,9 +102,9 @@ static void i40e_free_adminq_arq(struct i40e_hw *hw)\n * i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue\n * @hw: pointer to the hardware structure\n **/\n-static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tiavf_status ret_code;\n \tstruct i40e_aq_desc *desc;\n \tstruct i40e_dma_mem *bi;\n \tint i;\n@@ -115,7 +115,7 @@ static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n \n \t/* buffer_info structures do not need alignment */\n \tret_code = i40e_allocate_virt_mem(hw, &hw->aq.arq.dma_head,\n-\t\t(hw->aq.num_arq_entries * sizeof(struct i40e_dma_mem)));\n+\t\t\t\t\t (hw->aq.num_arq_entries * sizeof(struct i40e_dma_mem)));\n \tif (ret_code)\n \t\tgoto alloc_arq_bufs;\n \thw->aq.arq.r.arq_bi = (struct i40e_dma_mem *)hw->aq.arq.dma_head.va;\n@@ -169,15 +169,15 @@ static i40e_status i40e_alloc_arq_bufs(struct i40e_hw *hw)\n * i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue\n * @hw: pointer to the hardware structure\n **/\n-static i40e_status i40e_alloc_asq_bufs(struct i40e_hw *hw)\n+static iavf_status i40e_alloc_asq_bufs(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tiavf_status ret_code;\n \tstruct i40e_dma_mem *bi;\n \tint i;\n \n \t/* No mapped memory needed yet, just the buffer info structures */\n \tret_code = i40e_allocate_virt_mem(hw, &hw->aq.asq.dma_head,\n-\t\t(hw->aq.num_asq_entries * sizeof(struct i40e_dma_mem)));\n+\t\t\t\t\t (hw->aq.num_asq_entries * sizeof(struct i40e_dma_mem)));\n \tif (ret_code)\n \t\tgoto alloc_asq_bufs;\n \thw->aq.asq.r.asq_bi = (struct i40e_dma_mem *)hw->aq.asq.dma_head.va;\n@@ -253,9 +253,9 @@ static void i40e_free_asq_bufs(struct i40e_hw *hw)\n *\n * Configure base address and length registers for the transmit queue\n **/\n-static i40e_status i40e_config_asq_regs(struct i40e_hw *hw)\n+static iavf_status i40e_config_asq_regs(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \tu32 reg = 0;\n \n \t/* Clear Head and Tail */\n@@ -282,9 +282,9 @@ static i40e_status i40e_config_asq_regs(struct i40e_hw *hw)\n *\n * Configure base address and length registers for the receive (event queue)\n **/\n-static i40e_status i40e_config_arq_regs(struct i40e_hw *hw)\n+static iavf_status i40e_config_arq_regs(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \tu32 reg = 0;\n \n \t/* Clear Head and Tail */\n@@ -321,9 +321,9 @@ static i40e_status i40e_config_arq_regs(struct i40e_hw *hw)\n * Do *NOT* hold the lock when calling this as the memory allocation routines\n * called are not going to be atomic context safe\n **/\n-static i40e_status i40e_init_asq(struct i40e_hw *hw)\n+static iavf_status i40e_init_asq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \n \tif (hw->aq.asq.count > 0) {\n \t\t/* queue already initialized */\n@@ -380,9 +380,9 @@ static i40e_status i40e_init_asq(struct i40e_hw *hw)\n * Do *NOT* hold the lock when calling this as the memory allocation routines\n * called are not going to be atomic context safe\n **/\n-static i40e_status i40e_init_arq(struct i40e_hw *hw)\n+static iavf_status i40e_init_arq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \n \tif (hw->aq.arq.count > 0) {\n \t\t/* queue already initialized */\n@@ -432,9 +432,9 @@ static i40e_status i40e_init_arq(struct i40e_hw *hw)\n *\n * The main shutdown routine for the Admin Send Queue\n **/\n-static i40e_status i40e_shutdown_asq(struct i40e_hw *hw)\n+static iavf_status i40e_shutdown_asq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \n \tmutex_lock(&hw->aq.asq_mutex);\n \n@@ -466,9 +466,9 @@ static i40e_status i40e_shutdown_asq(struct i40e_hw *hw)\n *\n * The main shutdown routine for the Admin Receive Queue\n **/\n-static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)\n+static iavf_status i40e_shutdown_arq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \n \tmutex_lock(&hw->aq.arq_mutex);\n \n@@ -505,9 +505,9 @@ static i40e_status i40e_shutdown_arq(struct i40e_hw *hw)\n * - hw->aq.arq_buf_size\n * - hw->aq.asq_buf_size\n **/\n-i40e_status iavf_init_adminq(struct i40e_hw *hw)\n+iavf_status iavf_init_adminq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code;\n+\tiavf_status ret_code;\n \n \t/* verify input for valid configuration */\n \tif ((hw->aq.num_arq_entries == 0) ||\n@@ -549,9 +549,9 @@ i40e_status iavf_init_adminq(struct i40e_hw *hw)\n * iavf_shutdown_adminq - shutdown routine for the Admin Queue\n * @hw: pointer to the hardware structure\n **/\n-i40e_status iavf_shutdown_adminq(struct i40e_hw *hw)\n+iavf_status iavf_shutdown_adminq(struct i40e_hw *hw)\n {\n-\ti40e_status ret_code = 0;\n+\tiavf_status ret_code = 0;\n \n \tif (iavf_check_asq_alive(hw))\n \t\tiavf_aq_queue_shutdown(hw, true);\n@@ -570,7 +570,7 @@ i40e_status iavf_shutdown_adminq(struct i40e_hw *hw)\n **/\n static u16 i40e_clean_asq(struct i40e_hw *hw)\n {\n-\tstruct i40e_adminq_ring *asq = &(hw->aq.asq);\n+\tstruct i40e_adminq_ring *asq = &hw->aq.asq;\n \tstruct i40e_asq_cmd_details *details;\n \tu16 ntc = asq->next_to_clean;\n \tstruct i40e_aq_desc desc_cb;\n@@ -616,7 +616,6 @@ bool iavf_asq_done(struct i40e_hw *hw)\n \t * timing reliability than DD bit\n \t */\n \treturn rd32(hw, hw->aq.asq.head) == hw->aq.asq.next_to_use;\n-\n }\n \n /**\n@@ -630,17 +629,16 @@ bool iavf_asq_done(struct i40e_hw *hw)\n * This is the main send command driver routine for the Admin Queue send\n * queue. It runs the queue, cleans the queue, etc\n **/\n-i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n-\t\t\t\tstruct i40e_aq_desc *desc,\n-\t\t\t\tvoid *buff, /* can be NULL */\n-\t\t\t\tu16 buff_size,\n-\t\t\t\tstruct i40e_asq_cmd_details *cmd_details)\n+iavf_status iavf_asq_send_command(struct i40e_hw *hw, struct i40e_aq_desc *desc,\n+\t\t\t\t void *buff, /* can be NULL */\n+\t\t\t\t u16 buff_size,\n+\t\t\t\t struct i40e_asq_cmd_details *cmd_details)\n {\n-\ti40e_status status = 0;\n \tstruct i40e_dma_mem *dma_buff = NULL;\n \tstruct i40e_asq_cmd_details *details;\n \tstruct i40e_aq_desc *desc_on_ring;\n \tbool cmd_completed = false;\n+\tiavf_status status = 0;\n \tu16 retval = 0;\n \tu32 val = 0;\n \n@@ -724,8 +722,8 @@ i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n \t*desc_on_ring = *desc;\n \n \t/* if buff is not NULL assume indirect command */\n-\tif (buff != NULL) {\n-\t\tdma_buff = &(hw->aq.asq.r.asq_bi[hw->aq.asq.next_to_use]);\n+\tif (buff) {\n+\t\tdma_buff = &hw->aq.asq.r.asq_bi[hw->aq.asq.next_to_use];\n \t\t/* copy the user buff into the respective DMA buff */\n \t\tmemcpy(dma_buff->va, buff, buff_size);\n \t\tdesc_on_ring->datalen = cpu_to_le16(buff_size);\n@@ -742,7 +740,7 @@ i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n \t/* bump the tail */\n \ti40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, \"AQTX: desc and buffer:\\n\");\n \tiavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc_on_ring,\n-\t\t\tbuff, buff_size);\n+\t\t buff, buff_size);\n \t(hw->aq.asq.next_to_use)++;\n \tif (hw->aq.asq.next_to_use == hw->aq.asq.count)\n \t\thw->aq.asq.next_to_use = 0;\n@@ -769,7 +767,7 @@ i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n \t/* if ready, copy the desc back to temp */\n \tif (iavf_asq_done(hw)) {\n \t\t*desc = *desc_on_ring;\n-\t\tif (buff != NULL)\n+\t\tif (buff)\n \t\t\tmemcpy(buff, dma_buff->va, buff_size);\n \t\tretval = le16_to_cpu(desc->retval);\n \t\tif (retval != 0) {\n@@ -793,8 +791,7 @@ i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n \n \ti40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,\n \t\t \"AQTX: desc and buffer writeback:\\n\");\n-\tiavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff,\n-\t\t\tbuff_size);\n+\tiavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, buff, buff_size);\n \n \t/* save writeback aq if requested */\n \tif (details->wb_desc)\n@@ -826,8 +823,7 @@ i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n *\n * Fill the desc with default values\n **/\n-void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,\n-\t\t\t\t u16 opcode)\n+void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode)\n {\n \t/* zero out the desc */\n \tmemset((void *)desc, 0, sizeof(struct i40e_aq_desc));\n@@ -845,13 +841,13 @@ void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,\n * the contents through e. It can also return how many events are\n * left to process through 'pending'\n **/\n-i40e_status iavf_clean_arq_element(struct i40e_hw *hw,\n-\t\t\t\t\t struct i40e_arq_event_info *e,\n-\t\t\t\t\t u16 *pending)\n+iavf_status iavf_clean_arq_element(struct i40e_hw *hw,\n+\t\t\t\t struct i40e_arq_event_info *e,\n+\t\t\t\t u16 *pending)\n {\n-\ti40e_status ret_code = 0;\n \tu16 ntc = hw->aq.arq.next_to_clean;\n \tstruct i40e_aq_desc *desc;\n+\tiavf_status ret_code = 0;\n \tstruct i40e_dma_mem *bi;\n \tu16 desc_idx;\n \tu16 datalen;\n@@ -897,13 +893,13 @@ i40e_status iavf_clean_arq_element(struct i40e_hw *hw,\n \te->desc = *desc;\n \tdatalen = le16_to_cpu(desc->datalen);\n \te->msg_len = min(datalen, e->buf_len);\n-\tif (e->msg_buf != NULL && (e->msg_len != 0))\n+\tif (e->msg_buf && (e->msg_len != 0))\n \t\tmemcpy(e->msg_buf, hw->aq.arq.r.arq_bi[desc_idx].va,\n \t\t e->msg_len);\n \n \ti40e_debug(hw, I40E_DEBUG_AQ_MESSAGE, \"AQRX: desc and buffer:\\n\");\n \tiavf_debug_aq(hw, I40E_DEBUG_AQ_COMMAND, (void *)desc, e->msg_buf,\n-\t\t\thw->aq.arq_buf_size);\n+\t\t hw->aq.arq_buf_size);\n \n \t/* Restore the original datalen and buffer address in the desc,\n \t * FW updates datalen to indicate the event message\n@@ -930,7 +926,7 @@ i40e_status iavf_clean_arq_element(struct i40e_hw *hw,\n \n clean_arq_element_out:\n \t/* Set pending if needed, unlock and return */\n-\tif (pending != NULL)\n+\tif (pending)\n \t\t*pending = (ntc > ntu ? hw->aq.arq.count : 0) + (ntu - ntc);\n \n clean_arq_element_err:\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_alloc.h b/drivers/net/ethernet/intel/iavf/i40e_alloc.h\nindex cb8689222c8b..de3edf3bc8a4 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_alloc.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_alloc.h\n@@ -20,16 +20,16 @@ enum i40e_memory_type {\n };\n \n /* prototype for functions used for dynamic memory allocation */\n-i40e_status i40e_allocate_dma_mem(struct i40e_hw *hw,\n+iavf_status i40e_allocate_dma_mem(struct i40e_hw *hw,\n \t\t\t\t\t struct i40e_dma_mem *mem,\n \t\t\t\t\t enum i40e_memory_type type,\n \t\t\t\t\t u64 size, u32 alignment);\n-i40e_status i40e_free_dma_mem(struct i40e_hw *hw,\n+iavf_status i40e_free_dma_mem(struct i40e_hw *hw,\n \t\t\t\t\tstruct i40e_dma_mem *mem);\n-i40e_status i40e_allocate_virt_mem(struct i40e_hw *hw,\n+iavf_status i40e_allocate_virt_mem(struct i40e_hw *hw,\n \t\t\t\t\t struct i40e_virt_mem *mem,\n \t\t\t\t\t u32 size);\n-i40e_status i40e_free_virt_mem(struct i40e_hw *hw,\n+iavf_status i40e_free_virt_mem(struct i40e_hw *hw,\n \t\t\t\t\t struct i40e_virt_mem *mem);\n \n #endif /* _I40E_ALLOC_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_common.c b/drivers/net/ethernet/intel/iavf/i40e_common.c\nindex cc2e229ea976..96133efddf72 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_common.c\n+++ b/drivers/net/ethernet/intel/iavf/i40e_common.c\n@@ -13,9 +13,9 @@\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 **/\n-i40e_status i40e_set_mac_type(struct i40e_hw *hw)\n+iavf_status i40e_set_mac_type(struct i40e_hw *hw)\n {\n-\ti40e_status status = 0;\n+\tiavf_status status = 0;\n \n \tif (hw->vendor_id == PCI_VENDOR_ID_INTEL) {\n \t\tswitch (hw->device_id) {\n@@ -56,8 +56,7 @@ i40e_status i40e_set_mac_type(struct i40e_hw *hw)\n \t\tstatus = I40E_ERR_DEVICE_NOT_SUPPORTED;\n \t}\n \n-\thw_dbg(hw, \"i40e_set_mac_type found mac: %d, returns: %d\\n\",\n-\t\t hw->mac.type, status);\n+\thw_dbg(hw, \"found mac: %d, returns: %d\\n\", hw->mac.type, status);\n \treturn status;\n }\n \n@@ -126,7 +125,7 @@ const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)\n * @hw: pointer to the HW structure\n * @stat_err: the status error code to convert\n **/\n-const char *iavf_stat_str(struct i40e_hw *hw, i40e_status stat_err)\n+const char *iavf_stat_str(struct i40e_hw *hw, iavf_status stat_err)\n {\n \tswitch (stat_err) {\n \tcase 0:\n@@ -285,7 +284,7 @@ void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,\n \tstruct i40e_aq_desc *aq_desc = (struct i40e_aq_desc *)desc;\n \tu8 *buf = (u8 *)buffer;\n \n-\tif ((!(mask & hw->debug_mask)) || (desc == NULL))\n+\tif ((!(mask & hw->debug_mask)) || !desc)\n \t\treturn;\n \n \ti40e_debug(hw, mask,\n@@ -304,7 +303,7 @@ void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask, void *desc,\n \t\t le32_to_cpu(aq_desc->params.external.addr_high),\n \t\t le32_to_cpu(aq_desc->params.external.addr_low));\n \n-\tif ((buffer != NULL) && (aq_desc->datalen != 0)) {\n+\tif (buffer && aq_desc->datalen) {\n \t\tu16 len = le16_to_cpu(aq_desc->datalen);\n \n \t\ti40e_debug(hw, mask, \"AQ CMD Buffer:\\n\");\n@@ -349,16 +348,14 @@ bool iavf_check_asq_alive(struct i40e_hw *hw)\n * Tell the Firmware that we're shutting down the AdminQ and whether\n * or not the driver is unloading as well.\n **/\n-i40e_status iavf_aq_queue_shutdown(struct i40e_hw *hw,\n-\t\t\t\t\t bool unloading)\n+iavf_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading)\n {\n \tstruct i40e_aq_desc desc;\n \tstruct i40e_aqc_queue_shutdown *cmd =\n \t\t(struct i40e_aqc_queue_shutdown *)&desc.params.raw;\n-\ti40e_status status;\n+\tiavf_status status;\n \n-\tiavf_fill_default_direct_cmd_desc(&desc,\n-\t\t\t\t\t i40e_aqc_opc_queue_shutdown);\n+\tiavf_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_queue_shutdown);\n \n \tif (unloading)\n \t\tcmd->driver_unloading = cpu_to_le32(I40E_AQ_DRIVER_UNLOADING);\n@@ -378,22 +375,22 @@ i40e_status iavf_aq_queue_shutdown(struct i40e_hw *hw,\n *\n * Internal function to get or set RSS look up table\n **/\n-static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw,\n+static iavf_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw,\n \t\t\t\t\t u16 vsi_id, bool pf_lut,\n \t\t\t\t\t u8 *lut, u16 lut_size,\n \t\t\t\t\t bool set)\n {\n-\ti40e_status status;\n+\tiavf_status status;\n \tstruct i40e_aq_desc desc;\n \tstruct i40e_aqc_get_set_rss_lut *cmd_resp =\n \t\t (struct i40e_aqc_get_set_rss_lut *)&desc.params.raw;\n \n \tif (set)\n \t\tiavf_fill_default_direct_cmd_desc(&desc,\n-\t\t\t\t\t\t i40e_aqc_opc_set_rss_lut);\n+\t\t\t\t\t\t i40e_aqc_opc_set_rss_lut);\n \telse\n \t\tiavf_fill_default_direct_cmd_desc(&desc,\n-\t\t\t\t\t\t i40e_aqc_opc_get_rss_lut);\n+\t\t\t\t\t\t i40e_aqc_opc_get_rss_lut);\n \n \t/* Indirect command */\n \tdesc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);\n@@ -431,8 +428,8 @@ static i40e_status i40e_aq_get_set_rss_lut(struct i40e_hw *hw,\n *\n * get the RSS lookup table, PF or VSI type\n **/\n-i40e_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n-\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size)\n+iavf_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n+\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size,\n \t\t\t\t false);\n@@ -448,8 +445,8 @@ i40e_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n *\n * set the RSS lookup table, PF or VSI type\n **/\n-i40e_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n-\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size)\n+iavf_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n+\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn i40e_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size, true);\n }\n@@ -463,12 +460,12 @@ i40e_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 vsi_id,\n *\n * get the RSS key per VSI\n **/\n-static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw,\n-\t\t\t\t u16 vsi_id,\n-\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key,\n-\t\t\t\t bool set)\n+static\n+iavf_status i40e_aq_get_set_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key,\n+\t\t\t\t bool set)\n {\n-\ti40e_status status;\n+\tiavf_status status;\n \tstruct i40e_aq_desc desc;\n \tstruct i40e_aqc_get_set_rss_key *cmd_resp =\n \t\t\t(struct i40e_aqc_get_set_rss_key *)&desc.params.raw;\n@@ -476,10 +473,10 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw,\n \n \tif (set)\n \t\tiavf_fill_default_direct_cmd_desc(&desc,\n-\t\t\t\t\t\t i40e_aqc_opc_set_rss_key);\n+\t\t\t\t\t\t i40e_aqc_opc_set_rss_key);\n \telse\n \t\tiavf_fill_default_direct_cmd_desc(&desc,\n-\t\t\t\t\t\t i40e_aqc_opc_get_rss_key);\n+\t\t\t\t\t\t i40e_aqc_opc_get_rss_key);\n \n \t/* Indirect command */\n \tdesc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);\n@@ -503,9 +500,8 @@ static i40e_status i40e_aq_get_set_rss_key(struct i40e_hw *hw,\n * @key: pointer to key info struct\n *\n **/\n-i40e_status iavf_aq_get_rss_key(struct i40e_hw *hw,\n-\t\t\t\t u16 vsi_id,\n-\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key)\n+iavf_status iavf_aq_get_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn i40e_aq_get_set_rss_key(hw, vsi_id, key, false);\n }\n@@ -518,14 +514,12 @@ i40e_status iavf_aq_get_rss_key(struct i40e_hw *hw,\n *\n * set the RSS key per VSI\n **/\n-i40e_status iavf_aq_set_rss_key(struct i40e_hw *hw,\n-\t\t\t\t u16 vsi_id,\n-\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key)\n+iavf_status iavf_aq_set_rss_key(struct i40e_hw *hw, u16 vsi_id,\n+\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn i40e_aq_get_set_rss_key(hw, vsi_id, key, true);\n }\n \n-\n /* The iavf_ptype_lookup table is used to convert from the 8-bit ptype in the\n * hardware to a bit-field that can be used by SW to more easily determine the\n * packet type.\n@@ -904,14 +898,14 @@ struct i40e_rx_ptype_decoded iavf_ptype_lookup[] = {\n * is sent asynchronously, i.e. iavf_asq_send_command() does not wait for\n * completion before returning.\n **/\n-i40e_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n+iavf_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n \t\t\t\t enum virtchnl_ops v_opcode,\n-\t\t\t\t i40e_status v_retval, u8 *msg, u16 msglen,\n+\t\t\t\t iavf_status v_retval, u8 *msg, u16 msglen,\n \t\t\t\t struct i40e_asq_cmd_details *cmd_details)\n {\n-\tstruct i40e_aq_desc desc;\n \tstruct i40e_asq_cmd_details details;\n-\ti40e_status status;\n+\tstruct i40e_aq_desc desc;\n+\tiavf_status status;\n \n \tiavf_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_send_msg_to_pf);\n \tdesc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_SI);\n@@ -975,7 +969,7 @@ void iavf_vf_parse_hw_config(struct i40e_hw *hw,\n * as none will be forthcoming. Immediately after calling this function,\n * the admin queue should be shut down and (optionally) reinitialized.\n **/\n-i40e_status iavf_vf_reset(struct i40e_hw *hw)\n+iavf_status iavf_vf_reset(struct i40e_hw *hw)\n {\n \treturn iavf_aq_send_msg_to_pf(hw, VIRTCHNL_OP_RESET_VF,\n \t\t\t\t 0, NULL, 0, NULL);\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_osdep.h b/drivers/net/ethernet/intel/iavf/i40e_osdep.h\nindex 01e6babbdcd3..788a599dc26b 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_osdep.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_osdep.h\n@@ -48,5 +48,5 @@ struct i40e_virt_mem {\n extern void iavf_debug_d(void *hw, u32 mask, char *fmt_str, ...)\n \t__attribute__ ((format(gnu_printf, 3, 4)));\n \n-typedef enum i40e_status_code i40e_status;\n+typedef enum i40e_status_code iavf_status;\n #endif /* _I40E_OSDEP_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40e_prototype.h b/drivers/net/ethernet/intel/iavf/i40e_prototype.h\nindex ea38aaf4a511..f2d52ec2ece0 100644\n--- a/drivers/net/ethernet/intel/iavf/i40e_prototype.h\n+++ b/drivers/net/ethernet/intel/iavf/i40e_prototype.h\n@@ -16,13 +16,13 @@\n */\n \n /* adminq functions */\n-i40e_status iavf_init_adminq(struct i40e_hw *hw);\n-i40e_status iavf_shutdown_adminq(struct i40e_hw *hw);\n+iavf_status iavf_init_adminq(struct i40e_hw *hw);\n+iavf_status iavf_shutdown_adminq(struct i40e_hw *hw);\n void i40e_adminq_init_ring_data(struct i40e_hw *hw);\n-i40e_status iavf_clean_arq_element(struct i40e_hw *hw,\n+iavf_status iavf_clean_arq_element(struct i40e_hw *hw,\n \t\t\t\t\t struct i40e_arq_event_info *e,\n \t\t\t\t\t u16 *events_pending);\n-i40e_status iavf_asq_send_command(struct i40e_hw *hw,\n+iavf_status iavf_asq_send_command(struct i40e_hw *hw,\n \t\t\t\tstruct i40e_aq_desc *desc,\n \t\t\t\tvoid *buff, /* can be NULL */\n \t\t\t\tu16 buff_size,\n@@ -36,22 +36,22 @@ void iavf_debug_aq(struct i40e_hw *hw, enum i40e_debug_mask mask,\n void i40e_idle_aq(struct i40e_hw *hw);\n void iavf_resume_aq(struct i40e_hw *hw);\n bool iavf_check_asq_alive(struct i40e_hw *hw);\n-i40e_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);\n+iavf_status iavf_aq_queue_shutdown(struct i40e_hw *hw, bool unloading);\n const char *iavf_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err);\n-const char *iavf_stat_str(struct i40e_hw *hw, i40e_status stat_err);\n+const char *iavf_stat_str(struct i40e_hw *hw, iavf_status stat_err);\n \n-i40e_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,\n+iavf_status iavf_aq_get_rss_lut(struct i40e_hw *hw, u16 seid,\n \t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n-i40e_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 seid,\n+iavf_status iavf_aq_set_rss_lut(struct i40e_hw *hw, u16 seid,\n \t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n-i40e_status iavf_aq_get_rss_key(struct i40e_hw *hw,\n+iavf_status iavf_aq_get_rss_key(struct i40e_hw *hw,\n \t\t\t\t u16 seid,\n \t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n-i40e_status iavf_aq_set_rss_key(struct i40e_hw *hw,\n+iavf_status iavf_aq_set_rss_key(struct i40e_hw *hw,\n \t\t\t\t u16 seid,\n \t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n \n-i40e_status i40e_set_mac_type(struct i40e_hw *hw);\n+iavf_status i40e_set_mac_type(struct i40e_hw *hw);\n \n extern struct i40e_rx_ptype_decoded iavf_ptype_lookup[];\n \n@@ -63,9 +63,9 @@ static inline struct i40e_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)\n /* i40e_common for VF drivers*/\n void iavf_vf_parse_hw_config(struct i40e_hw *hw,\n \t\t\t struct virtchnl_vf_resource *msg);\n-i40e_status iavf_vf_reset(struct i40e_hw *hw);\n-i40e_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n+iavf_status iavf_vf_reset(struct i40e_hw *hw);\n+iavf_status iavf_aq_send_msg_to_pf(struct i40e_hw *hw,\n \t\t\t\t enum virtchnl_ops v_opcode,\n-\t\t\t\t i40e_status v_retval, u8 *msg, u16 msglen,\n+\t\t\t\t iavf_status v_retval, u8 *msg, u16 msglen,\n \t\t\t\t struct i40e_asq_cmd_details *cmd_details);\n #endif /* _I40E_PROTOTYPE_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40evf.h b/drivers/net/ethernet/intel/iavf/i40evf.h\nindex 15a0910a7a79..19a93bfdb65c 100644\n--- a/drivers/net/ethernet/intel/iavf/i40evf.h\n+++ b/drivers/net/ethernet/intel/iavf/i40evf.h\n@@ -411,7 +411,7 @@ void iavf_enable_vlan_stripping(struct iavf_adapter *adapter);\n void iavf_disable_vlan_stripping(struct iavf_adapter *adapter);\n void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\t\t\tenum virtchnl_ops v_opcode,\n-\t\t\t\ti40e_status v_retval, u8 *msg, u16 msglen);\n+\t\t\t\tiavf_status v_retval, u8 *msg, u16 msglen);\n int iavf_config_rss(struct iavf_adapter *adapter);\n int iavf_lan_add_device(struct iavf_adapter *adapter);\n int iavf_lan_del_device(struct iavf_adapter *adapter);\ndiff --git a/drivers/net/ethernet/intel/iavf/i40evf_client.c b/drivers/net/ethernet/intel/iavf/i40evf_client.c\nindex 71d94cb24602..d2660659174d 100644\n--- a/drivers/net/ethernet/intel/iavf/i40evf_client.c\n+++ b/drivers/net/ethernet/intel/iavf/i40evf_client.c\n@@ -135,7 +135,7 @@ void iavf_notify_client_open(struct i40e_vsi *vsi)\n static int iavf_client_release_qvlist(struct i40e_info *ldev)\n {\n \tstruct iavf_adapter *adapter = ldev->vf;\n-\ti40e_status err;\n+\tiavf_status err;\n \n \tif (adapter->aq_required)\n \t\treturn -EAGAIN;\n@@ -420,7 +420,7 @@ static u32 iavf_client_virtchnl_send(struct i40e_info *ldev,\n \t\t\t\t u8 *msg, u16 len)\n {\n \tstruct iavf_adapter *adapter = ldev->vf;\n-\ti40e_status err;\n+\tiavf_status err;\n \n \tif (adapter->aq_required)\n \t\treturn -EAGAIN;\n@@ -449,7 +449,7 @@ static int iavf_client_setup_qvlist(struct i40e_info *ldev,\n \tstruct virtchnl_iwarp_qvlist_info *v_qvlist_info;\n \tstruct iavf_adapter *adapter = ldev->vf;\n \tstruct i40e_qv_info *qv_info;\n-\ti40e_status err;\n+\tiavf_status err;\n \tu32 v_idx, i;\n \tu32 msg_size;\n \ndiff --git a/drivers/net/ethernet/intel/iavf/i40evf_ethtool.c b/drivers/net/ethernet/intel/iavf/i40evf_ethtool.c\nindex 8eb6686eebd0..0277df40e53f 100644\n--- a/drivers/net/ethernet/intel/iavf/i40evf_ethtool.c\n+++ b/drivers/net/ethernet/intel/iavf/i40evf_ethtool.c\n@@ -277,7 +277,7 @@ static const struct iavf_priv_flags iavf_gstrings_priv_flags[] = {\n * kind of link we really have, so we fake it.\n **/\n static int iavf_get_link_ksettings(struct net_device *netdev,\n-\t\t\t\t struct ethtool_link_ksettings *cmd)\n+\t\t\t\t struct ethtool_link_ksettings *cmd)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \n@@ -344,7 +344,7 @@ static int iavf_get_sset_count(struct net_device *netdev, int sset)\n * All statistics are added to the data buffer as an array of u64.\n **/\n static void iavf_get_ethtool_stats(struct net_device *netdev,\n-\t\t\t\t struct ethtool_stats *stats, u64 *data)\n+\t\t\t\t struct ethtool_stats *stats, u64 *data)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tunsigned int i;\n@@ -561,7 +561,7 @@ static void iavf_set_msglevel(struct net_device *netdev, u32 data)\n * Returns information about the driver and device for display to the user.\n **/\n static void iavf_get_drvinfo(struct net_device *netdev,\n-\t\t\t struct ethtool_drvinfo *drvinfo)\n+\t\t\t struct ethtool_drvinfo *drvinfo)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \n@@ -581,7 +581,7 @@ static void iavf_get_drvinfo(struct net_device *netdev,\n * but the number of rings is not reported.\n **/\n static void iavf_get_ringparam(struct net_device *netdev,\n-\t\t\t\t struct ethtool_ringparam *ring)\n+\t\t\t struct ethtool_ringparam *ring)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \n@@ -600,7 +600,7 @@ static void iavf_get_ringparam(struct net_device *netdev,\n * number of rings is not specified, so all rings get the same settings.\n **/\n static int iavf_set_ringparam(struct net_device *netdev,\n-\t\t\t\tstruct ethtool_ringparam *ring)\n+\t\t\t struct ethtool_ringparam *ring)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tu32 new_rx_count, new_tx_count;\n@@ -645,8 +645,7 @@ static int iavf_set_ringparam(struct net_device *netdev,\n * representative value.\n **/\n static int __iavf_get_coalesce(struct net_device *netdev,\n-\t\t\t\t struct ethtool_coalesce *ec,\n-\t\t\t\t int queue)\n+\t\t\t struct ethtool_coalesce *ec, int queue)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = &adapter->vsi;\n@@ -689,7 +688,7 @@ static int __iavf_get_coalesce(struct net_device *netdev,\n * only represents the settings of queue 0.\n **/\n static int iavf_get_coalesce(struct net_device *netdev,\n-\t\t\t struct ethtool_coalesce *ec)\n+\t\t\t struct ethtool_coalesce *ec)\n {\n \treturn __iavf_get_coalesce(netdev, ec, -1);\n }\n@@ -702,9 +701,8 @@ static int iavf_get_coalesce(struct net_device *netdev,\n *\n * Read specific queue's coalesce settings.\n **/\n-static int iavf_get_per_queue_coalesce(struct net_device *netdev,\n-\t\t\t\t\t u32 queue,\n-\t\t\t\t\t struct ethtool_coalesce *ec)\n+static int iavf_get_per_queue_coalesce(struct net_device *netdev, u32 queue,\n+\t\t\t\t struct ethtool_coalesce *ec)\n {\n \treturn __iavf_get_coalesce(netdev, ec, queue);\n }\n@@ -718,8 +716,7 @@ static int iavf_get_per_queue_coalesce(struct net_device *netdev,\n * Change the ITR settings for a specific queue.\n **/\n static void iavf_set_itr_per_queue(struct iavf_adapter *adapter,\n-\t\t\t\t struct ethtool_coalesce *ec,\n-\t\t\t\t int queue)\n+\t\t\t\t struct ethtool_coalesce *ec, int queue)\n {\n \tstruct i40e_ring *rx_ring = &adapter->rx_rings[queue];\n \tstruct i40e_ring *tx_ring = &adapter->tx_rings[queue];\n@@ -757,8 +754,7 @@ static void iavf_set_itr_per_queue(struct iavf_adapter *adapter,\n * Sets the coalesce settings for a particular queue.\n **/\n static int __iavf_set_coalesce(struct net_device *netdev,\n-\t\t\t\t struct ethtool_coalesce *ec,\n-\t\t\t\t int queue)\n+\t\t\t struct ethtool_coalesce *ec, int queue)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tstruct i40e_vsi *vsi = &adapter->vsi;\n@@ -774,10 +770,7 @@ static int __iavf_set_coalesce(struct net_device *netdev,\n \t\t (ec->rx_coalesce_usecs > I40E_MAX_ITR)) {\n \t\tnetif_info(adapter, drv, netdev, \"Invalid value, rx-usecs range is 0-8160\\n\");\n \t\treturn -EINVAL;\n-\t}\n-\n-\telse\n-\tif (ec->tx_coalesce_usecs == 0) {\n+\t} else if (ec->tx_coalesce_usecs == 0) {\n \t\tif (ec->use_adaptive_tx_coalesce)\n \t\t\tnetif_info(adapter, drv, netdev, \"tx-usecs=0, need to disable adaptive-tx for a complete disable\\n\");\n \t} else if ((ec->tx_coalesce_usecs < I40E_MIN_ITR) ||\n@@ -811,7 +804,7 @@ static int __iavf_set_coalesce(struct net_device *netdev,\n * Change current coalescing settings for every queue.\n **/\n static int iavf_set_coalesce(struct net_device *netdev,\n-\t\t\t struct ethtool_coalesce *ec)\n+\t\t\t struct ethtool_coalesce *ec)\n {\n \treturn __iavf_set_coalesce(netdev, ec, -1);\n }\n@@ -824,9 +817,8 @@ static int iavf_set_coalesce(struct net_device *netdev,\n *\n * Modifies a specific queue's coalesce settings.\n */\n-static int iavf_set_per_queue_coalesce(struct net_device *netdev,\n-\t\t\t\t\t u32 queue,\n-\t\t\t\t\t struct ethtool_coalesce *ec)\n+static int iavf_set_per_queue_coalesce(struct net_device *netdev, u32 queue,\n+\t\t\t\t struct ethtool_coalesce *ec)\n {\n \treturn __iavf_set_coalesce(netdev, ec, queue);\n }\n@@ -840,8 +832,7 @@ static int iavf_set_per_queue_coalesce(struct net_device *netdev,\n * Returns Success if the command is supported.\n **/\n static int iavf_get_rxnfc(struct net_device *netdev,\n-\t\t\t struct ethtool_rxnfc *cmd,\n-\t\t\t u32 *rule_locs)\n+\t\t\t struct ethtool_rxnfc *cmd, u32 *rule_locs)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tint ret = -EOPNOTSUPP;\n@@ -870,7 +861,7 @@ static int iavf_get_rxnfc(struct net_device *netdev,\n * queue pair. Report one extra channel to match our \"other\" MSI-X vector.\n **/\n static void iavf_get_channels(struct net_device *netdev,\n-\t\t\t\tstruct ethtool_channels *ch)\n+\t\t\t struct ethtool_channels *ch)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \n@@ -893,7 +884,7 @@ static void iavf_get_channels(struct net_device *netdev,\n * negative on failure.\n **/\n static int iavf_set_channels(struct net_device *netdev,\n-\t\t\t struct ethtool_channels *ch)\n+\t\t\t struct ethtool_channels *ch)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tint num_req = ch->combined_count;\n@@ -960,7 +951,7 @@ static u32 iavf_get_rxfh_indir_size(struct net_device *netdev)\n * Reads the indirection table directly from the hardware. Always returns 0.\n **/\n static int iavf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n-\t\t\t u8 *hfunc)\n+\t\t\t u8 *hfunc)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tu16 i;\n@@ -990,7 +981,7 @@ static int iavf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,\n * returns 0 after programming the table.\n **/\n static int iavf_set_rxfh(struct net_device *netdev, const u32 *indir,\n-\t\t\t const u8 *key, const u8 hfunc)\n+\t\t\t const u8 *key, const u8 hfunc)\n {\n \tstruct iavf_adapter *adapter = netdev_priv(netdev);\n \tu16 i;\n@@ -1002,9 +993,8 @@ static int iavf_set_rxfh(struct net_device *netdev, const u32 *indir,\n \tif (!indir)\n \t\treturn 0;\n \n-\tif (key) {\n+\tif (key)\n \t\tmemcpy(adapter->rss_key, key, adapter->rss_key_size);\n-\t}\n \n \t/* Each 32 bits pointed by 'indir' is stored with a lut entry */\n \tfor (i = 0; i < adapter->rss_lut_size; i++)\ndiff --git a/drivers/net/ethernet/intel/iavf/i40evf_main.c b/drivers/net/ethernet/intel/iavf/i40evf_main.c\nindex f7b4d5aacee3..600ea4040af2 100644\n--- a/drivers/net/ethernet/intel/iavf/i40evf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/i40evf_main.c\n@@ -66,7 +66,7 @@ static struct workqueue_struct *iavf_wq;\n * @size: size of memory requested\n * @alignment: what to align the allocation to\n **/\n-i40e_status iavf_allocate_dma_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_allocate_dma_mem_d(struct i40e_hw *hw,\n \t\t\t\t struct i40e_dma_mem *mem,\n \t\t\t\t u64 size, u32 alignment)\n {\n@@ -89,7 +89,7 @@ i40e_status iavf_allocate_dma_mem_d(struct i40e_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-i40e_status iavf_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)\n+iavf_status iavf_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)\n {\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n@@ -106,7 +106,7 @@ i40e_status iavf_free_dma_mem_d(struct i40e_hw *hw, struct i40e_dma_mem *mem)\n * @mem: ptr to mem struct to fill out\n * @size: size of memory requested\n **/\n-i40e_status iavf_allocate_virt_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_allocate_virt_mem_d(struct i40e_hw *hw,\n \t\t\t\t struct i40e_virt_mem *mem, u32 size)\n {\n \tif (!mem)\n@@ -126,7 +126,7 @@ i40e_status iavf_allocate_virt_mem_d(struct i40e_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-i40e_status iavf_free_virt_mem_d(struct i40e_hw *hw,\n+iavf_status iavf_free_virt_mem_d(struct i40e_hw *hw,\n \t\t\t\t struct i40e_virt_mem *mem)\n {\n \tif (!mem)\n@@ -469,6 +469,7 @@ iavf_request_traffic_irqs(struct iavf_adapter *adapter, char *basename)\n \n \tfor (vector = 0; vector < q_vectors; vector++) {\n \t\tstruct i40e_q_vector *q_vector = &adapter->q_vectors[vector];\n+\n \t\tirq_num = adapter->msix_entries[vector + NONQ_VECS].vector;\n \n \t\tif (q_vector->tx.ring && q_vector->rx.ring) {\n@@ -1427,6 +1428,7 @@ static void iavf_free_q_vectors(struct iavf_adapter *adapter)\n \n \tfor (q_idx = 0; q_idx < num_q_vectors; q_idx++) {\n \t\tstruct i40e_q_vector *q_vector = &adapter->q_vectors[q_idx];\n+\n \t\tif (q_idx < napi_vectors)\n \t\t\tnetif_napi_del(&q_vector->napi);\n \t}\n@@ -2049,7 +2051,7 @@ static void iavf_adminq_task(struct work_struct *work)\n \tstruct i40e_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops v_op;\n-\ti40e_status ret, v_ret;\n+\tiavf_status ret, v_ret;\n \tu32 val, oldval;\n \tu16 pending;\n \n@@ -2064,7 +2066,7 @@ static void iavf_adminq_task(struct work_struct *work)\n \tdo {\n \t\tret = iavf_clean_arq_element(hw, &event, &pending);\n \t\tv_op = (enum virtchnl_ops)le32_to_cpu(event.desc.cookie_high);\n-\t\tv_ret = (i40e_status)le32_to_cpu(event.desc.cookie_low);\n+\t\tv_ret = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n \n \t\tif (ret || !v_op)\n \t\t\tbreak; /* No event to process or error cleaning ARQ */\ndiff --git a/drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c b/drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c\nindex 4dbba07fd383..6a2bc501658c 100644\n--- a/drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/i40evf_virtchnl.c\n@@ -18,11 +18,11 @@\n *\n * Send message to PF and print status if failure.\n **/\n-static int iavf_send_pf_msg(struct iavf_adapter *adapter,\n-\t\t\t enum virtchnl_ops op, u8 *msg, u16 len)\n+static int iavf_send_pf_msg(struct iavf_adapter *adapter, enum virtchnl_ops op,\n+\t\t\t u8 *msg, u16 len)\n {\n \tstruct i40e_hw *hw = &adapter->hw;\n-\ti40e_status err;\n+\tiavf_status err;\n \n \tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)\n \t\treturn 0; /* nothing to see here, move along */\n@@ -51,7 +51,7 @@ int iavf_send_api_ver(struct iavf_adapter *adapter)\n \tvvi.minor = VIRTCHNL_VERSION_MINOR;\n \n \treturn iavf_send_pf_msg(adapter, VIRTCHNL_OP_VERSION, (u8 *)&vvi,\n-\t\t\t\t sizeof(vvi));\n+\t\t\t\tsizeof(vvi));\n }\n \n /**\n@@ -69,7 +69,7 @@ int iavf_verify_api_ver(struct iavf_adapter *adapter)\n \tstruct i40e_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n-\ti40e_status err;\n+\tiavf_status err;\n \n \tevent.buf_len = IAVF_MAX_AQ_BUF_SIZE;\n \tevent.msg_buf = kzalloc(event.buf_len, GFP_KERNEL);\n@@ -92,7 +92,7 @@ int iavf_verify_api_ver(struct iavf_adapter *adapter)\n \t}\n \n \n-\terr = (i40e_status)le32_to_cpu(event.desc.cookie_low);\n+\terr = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n \tif (err)\n \t\tgoto out_alloc;\n \n@@ -144,13 +144,11 @@ int iavf_send_vf_config_msg(struct iavf_adapter *adapter)\n \tadapter->current_op = VIRTCHNL_OP_GET_VF_RESOURCES;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_GET_CONFIG;\n \tif (PF_IS_V11(adapter))\n-\t\treturn iavf_send_pf_msg(adapter,\n-\t\t\t\t\t VIRTCHNL_OP_GET_VF_RESOURCES,\n-\t\t\t\t\t (u8 *)&caps, sizeof(caps));\n+\t\treturn iavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_VF_RESOURCES,\n+\t\t\t\t\t(u8 *)&caps, sizeof(caps));\n \telse\n-\t\treturn iavf_send_pf_msg(adapter,\n-\t\t\t\t\t VIRTCHNL_OP_GET_VF_RESOURCES,\n-\t\t\t\t\t NULL, 0);\n+\t\treturn iavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_VF_RESOURCES,\n+\t\t\t\t\tNULL, 0);\n }\n \n /**\n@@ -193,7 +191,7 @@ int iavf_get_vf_config(struct iavf_adapter *adapter)\n \tstruct i40e_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n-\ti40e_status err;\n+\tiavf_status err;\n \tu16 len;\n \n \tlen = sizeof(struct virtchnl_vf_resource) +\n@@ -218,7 +216,7 @@ int iavf_get_vf_config(struct iavf_adapter *adapter)\n \t\t\tbreak;\n \t}\n \n-\terr = (i40e_status)le32_to_cpu(event.desc.cookie_low);\n+\terr = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n \tmemcpy(adapter->vf_res, event.msg_buf, min(event.msg_len, len));\n \n \t/* some PFs send more queues than we should have so validate that\n@@ -287,8 +285,8 @@ void iavf_configure_queues(struct iavf_adapter *adapter)\n \t}\n \n \tadapter->aq_required &= ~IAVF_FLAG_AQ_CONFIGURE_QUEUES;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_VSI_QUEUES,\n-\t\t\t (u8 *)vqci, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_VSI_QUEUES, (u8 *)vqci,\n+\t\t\t len);\n \tkfree(vqci);\n }\n \n@@ -313,8 +311,8 @@ void iavf_enable_queues(struct iavf_adapter *adapter)\n \tvqs.tx_queues = BIT(adapter->num_active_queues) - 1;\n \tvqs.rx_queues = vqs.tx_queues;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_ENABLE_QUEUES;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_QUEUES,\n-\t\t\t (u8 *)&vqs, sizeof(vqs));\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_QUEUES, (u8 *)&vqs,\n+\t\t\t sizeof(vqs));\n }\n \n /**\n@@ -338,8 +336,8 @@ void iavf_disable_queues(struct iavf_adapter *adapter)\n \tvqs.tx_queues = BIT(adapter->num_active_queues) - 1;\n \tvqs.rx_queues = vqs.tx_queues;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_DISABLE_QUEUES;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_QUEUES,\n-\t\t\t (u8 *)&vqs, sizeof(vqs));\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_QUEUES, (u8 *)&vqs,\n+\t\t\t sizeof(vqs));\n }\n \n /**\n@@ -394,8 +392,7 @@ void iavf_map_queues(struct iavf_adapter *adapter)\n \tvecmap->rxq_map = 0;\n \n \tadapter->aq_required &= ~IAVF_FLAG_AQ_MAP_VECTORS;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_IRQ_MAP,\n-\t\t\t (u8 *)vimi, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_IRQ_MAP, (u8 *)vimi, len);\n \tkfree(vimi);\n }\n \n@@ -423,7 +420,7 @@ int iavf_request_queues(struct iavf_adapter *adapter, int num)\n \tadapter->current_op = VIRTCHNL_OP_REQUEST_QUEUES;\n \tadapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;\n \treturn iavf_send_pf_msg(adapter, VIRTCHNL_OP_REQUEST_QUEUES,\n-\t\t\t\t (u8 *)&vfres, sizeof(vfres));\n+\t\t\t\t(u8 *)&vfres, sizeof(vfres));\n }\n \n /**\n@@ -493,8 +490,7 @@ void iavf_add_ether_addrs(struct iavf_adapter *adapter)\n \n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n \n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ADD_ETH_ADDR,\n-\t\t\t (u8 *)veal, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ADD_ETH_ADDR, (u8 *)veal, len);\n \tkfree(veal);\n }\n \n@@ -565,8 +561,7 @@ void iavf_del_ether_addrs(struct iavf_adapter *adapter)\n \n \tspin_unlock_bh(&adapter->mac_vlan_list_lock);\n \n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DEL_ETH_ADDR,\n-\t\t\t (u8 *)veal, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DEL_ETH_ADDR, (u8 *)veal, len);\n \tkfree(veal);\n }\n \n@@ -756,7 +751,7 @@ void iavf_set_promiscuous(struct iavf_adapter *adapter, int flags)\n \tvpi.vsi_id = adapter->vsi_res->vsi_id;\n \tvpi.flags = flags;\n \tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_PROMISCUOUS_MODE,\n-\t\t\t (u8 *)&vpi, sizeof(vpi));\n+\t\t\t (u8 *)&vpi, sizeof(vpi));\n }\n \n /**\n@@ -776,8 +771,8 @@ void iavf_request_stats(struct iavf_adapter *adapter)\n \tadapter->current_op = VIRTCHNL_OP_GET_STATS;\n \tvqs.vsi_id = adapter->vsi_res->vsi_id;\n \t/* queue maps are ignored for this message - only the vsi is used */\n-\tif (iavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_STATS,\n-\t\t\t (u8 *)&vqs, sizeof(vqs)))\n+\tif (iavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_STATS, (u8 *)&vqs,\n+\t\t\t sizeof(vqs)))\n \t\t/* if the request failed, don't lock out others */\n \t\tadapter->current_op = VIRTCHNL_OP_UNKNOWN;\n }\n@@ -798,8 +793,7 @@ void iavf_get_hena(struct iavf_adapter *adapter)\n \t}\n \tadapter->current_op = VIRTCHNL_OP_GET_RSS_HENA_CAPS;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_GET_HENA;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_RSS_HENA_CAPS,\n-\t\t\t NULL, 0);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_RSS_HENA_CAPS, NULL, 0);\n }\n \n /**\n@@ -821,8 +815,8 @@ void iavf_set_hena(struct iavf_adapter *adapter)\n \tvrh.hena = adapter->hena;\n \tadapter->current_op = VIRTCHNL_OP_SET_RSS_HENA;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_SET_HENA;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_SET_RSS_HENA,\n-\t\t\t (u8 *)&vrh, sizeof(vrh));\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_SET_RSS_HENA, (u8 *)&vrh,\n+\t\t\t sizeof(vrh));\n }\n \n /**\n@@ -853,8 +847,7 @@ void iavf_set_rss_key(struct iavf_adapter *adapter)\n \n \tadapter->current_op = VIRTCHNL_OP_CONFIG_RSS_KEY;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_SET_RSS_KEY;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_RSS_KEY,\n-\t\t\t (u8 *)vrk, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_RSS_KEY, (u8 *)vrk, len);\n \tkfree(vrk);\n }\n \n@@ -885,8 +878,7 @@ void iavf_set_rss_lut(struct iavf_adapter *adapter)\n \tmemcpy(vrl->lut, adapter->rss_lut, adapter->rss_lut_size);\n \tadapter->current_op = VIRTCHNL_OP_CONFIG_RSS_LUT;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_SET_RSS_LUT;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_RSS_LUT,\n-\t\t\t (u8 *)vrl, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_RSS_LUT, (u8 *)vrl, len);\n \tkfree(vrl);\n }\n \n@@ -906,8 +898,7 @@ void iavf_enable_vlan_stripping(struct iavf_adapter *adapter)\n \t}\n \tadapter->current_op = VIRTCHNL_OP_ENABLE_VLAN_STRIPPING;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_ENABLE_VLAN_STRIPPING;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING,\n-\t\t\t NULL, 0);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_VLAN_STRIPPING, NULL, 0);\n }\n \n /**\n@@ -926,8 +917,7 @@ void iavf_disable_vlan_stripping(struct iavf_adapter *adapter)\n \t}\n \tadapter->current_op = VIRTCHNL_OP_DISABLE_VLAN_STRIPPING;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_DISABLE_VLAN_STRIPPING;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING,\n-\t\t\t NULL, 0);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_VLAN_STRIPPING, NULL, 0);\n }\n \n /**\n@@ -1011,8 +1001,7 @@ void iavf_enable_channels(struct iavf_adapter *adapter)\n \tadapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;\n \tadapter->current_op = VIRTCHNL_OP_ENABLE_CHANNELS;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_ENABLE_CHANNELS;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_CHANNELS,\n-\t\t\t (u8 *)vti, len);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ENABLE_CHANNELS, (u8 *)vti, len);\n \tkfree(vti);\n }\n \n@@ -1035,8 +1024,7 @@ void iavf_disable_channels(struct iavf_adapter *adapter)\n \tadapter->flags |= IAVF_FLAG_REINIT_ITR_NEEDED;\n \tadapter->current_op = VIRTCHNL_OP_DISABLE_CHANNELS;\n \tadapter->aq_required &= ~IAVF_FLAG_AQ_DISABLE_CHANNELS;\n-\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_CHANNELS,\n-\t\t\t NULL, 0);\n+\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DISABLE_CHANNELS, NULL, 0);\n }\n \n /**\n@@ -1047,7 +1035,7 @@ void iavf_disable_channels(struct iavf_adapter *adapter)\n * Print the cloud filter\n **/\n static void iavf_print_cloud_filter(struct iavf_adapter *adapter,\n-\t\t\t\t struct virtchnl_filter *f)\n+\t\t\t\t struct virtchnl_filter *f)\n {\n \tswitch (f->flow_type) {\n \tcase VIRTCHNL_TCP_V4_FLOW:\n@@ -1114,9 +1102,8 @@ void iavf_add_cloud_filter(struct iavf_adapter *adapter)\n \t\t\tmemcpy(f, &cf->f, sizeof(struct virtchnl_filter));\n \t\t\tcf->add = false;\n \t\t\tcf->state = __IAVF_CF_ADD_PENDING;\n-\t\t\tiavf_send_pf_msg(adapter,\n-\t\t\t\t\t VIRTCHNL_OP_ADD_CLOUD_FILTER,\n-\t\t\t\t\t (u8 *)f, len);\n+\t\t\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_ADD_CLOUD_FILTER,\n+\t\t\t\t\t (u8 *)f, len);\n \t\t}\n \t}\n \tkfree(f);\n@@ -1163,9 +1150,8 @@ void iavf_del_cloud_filter(struct iavf_adapter *adapter)\n \t\t\tmemcpy(f, &cf->f, sizeof(struct virtchnl_filter));\n \t\t\tcf->del = false;\n \t\t\tcf->state = __IAVF_CF_DEL_PENDING;\n-\t\t\tiavf_send_pf_msg(adapter,\n-\t\t\t\t\t VIRTCHNL_OP_DEL_CLOUD_FILTER,\n-\t\t\t\t\t (u8 *)f, len);\n+\t\t\tiavf_send_pf_msg(adapter, VIRTCHNL_OP_DEL_CLOUD_FILTER,\n+\t\t\t\t\t (u8 *)f, len);\n \t\t}\n \t}\n \tkfree(f);\n@@ -1197,9 +1183,8 @@ void iavf_request_reset(struct iavf_adapter *adapter)\n * This function handles the reply messages.\n **/\n void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n-\t\t\t\tenum virtchnl_ops v_opcode,\n-\t\t\t\ti40e_status v_retval,\n-\t\t\t\tu8 *msg, u16 msglen)\n+\t\t\t enum virtchnl_ops v_opcode, iavf_status v_retval,\n+\t\t\t u8 *msg, u16 msglen)\n {\n \tstruct net_device *netdev = adapter->netdev;\n \n@@ -1207,6 +1192,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\tstruct virtchnl_pf_event *vpe =\n \t\t\t(struct virtchnl_pf_event *)msg;\n \t\tbool link_up = vpe->event_data.link_event.link_status;\n+\n \t\tswitch (vpe->event) {\n \t\tcase VIRTCHNL_EVENT_LINK_CHANGE:\n \t\t\tadapter->link_speed =\n@@ -1304,9 +1290,8 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\t\t\t\tcf->state = __IAVF_CF_INVALID;\n \t\t\t\t\tdev_info(&adapter->pdev->dev, \"Failed to add cloud filter, error %s\\n\",\n \t\t\t\t\t\t iavf_stat_str(&adapter->hw,\n-\t\t\t\t\t\t\t\t v_retval));\n-\t\t\t\t\tiavf_print_cloud_filter(adapter,\n-\t\t\t\t\t\t\t\t &cf->f);\n+\t\t\t\t\t\t\t v_retval));\n+\t\t\t\t\tiavf_print_cloud_filter(adapter, &cf->f);\n \t\t\t\t\tlist_del(&cf->list);\n \t\t\t\t\tkfree(cf);\n \t\t\t\t\tadapter->num_cloud_filters--;\n@@ -1323,17 +1308,15 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\t\t\t\tcf->state = __IAVF_CF_ACTIVE;\n \t\t\t\t\tdev_info(&adapter->pdev->dev, \"Failed to del cloud filter, error %s\\n\",\n \t\t\t\t\t\t iavf_stat_str(&adapter->hw,\n-\t\t\t\t\t\t\t\t v_retval));\n-\t\t\t\t\tiavf_print_cloud_filter(adapter,\n-\t\t\t\t\t\t\t\t &cf->f);\n+\t\t\t\t\t\t\t v_retval));\n+\t\t\t\t\tiavf_print_cloud_filter(adapter, &cf->f);\n \t\t\t\t}\n \t\t\t}\n \t\t\t}\n \t\t\tbreak;\n \t\tdefault:\n \t\t\tdev_err(&adapter->pdev->dev, \"PF returned error %d (%s) to our request %d\\n\",\n-\t\t\t\tv_retval,\n-\t\t\t\tiavf_stat_str(&adapter->hw, v_retval),\n+\t\t\t\tv_retval, iavf_stat_str(&adapter->hw, v_retval),\n \t\t\t\tv_opcode);\n \t\t}\n \t}\n@@ -1402,8 +1385,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\t * care about that.\n \t\t */\n \t\tif (msglen && CLIENT_ENABLED(adapter))\n-\t\t\tiavf_notify_client_message(&adapter->vsi,\n-\t\t\t\t\t\t msg, msglen);\n+\t\t\tiavf_notify_client_message(&adapter->vsi, msg, msglen);\n \t\tbreak;\n \n \tcase VIRTCHNL_OP_CONFIG_IWARP_IRQ_MAP:\n@@ -1412,6 +1394,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,\n \t\tbreak;\n \tcase VIRTCHNL_OP_GET_RSS_HENA_CAPS: {\n \t\tstruct virtchnl_rss_hena *vrh = (struct virtchnl_rss_hena *)msg;\n+\n \t\tif (msglen == sizeof(*vrh))\n \t\t\tadapter->hena = vrh->hena;\n \t\telse\n", "prefixes": [ "net-next", "v2", "04/14" ] }