Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1087274/?format=api
{ "id": 1087274, "url": "http://patchwork.ozlabs.org/api/patches/1087274/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190417221737.11460-7-alice.michael@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": "<20190417221737.11460-7-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-04-17T22:17:35", "name": "[next,S4,iavf,7/9] iavf: change remaining i40e defines to be iavf", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "efc216d5dbfac23a233ac0d59120701923a130b0", "submitter": { "id": 71123, "url": "http://patchwork.ozlabs.org/api/people/71123/?format=api", "name": "Michael, Alice", "email": "alice.michael@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/20190417221737.11460-7-alice.michael@intel.com/mbox/", "series": [ { "id": 103397, "url": "http://patchwork.ozlabs.org/api/series/103397/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/list/?series=103397", "date": "2019-04-17T22:17:29", "name": "[next,S4,iavf,1/9] iavf: Rename i40e_adminq* files to iavf_adminq*", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/103397/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1087274/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1087274/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<intel-wired-lan-bounces@osuosl.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Delivered-To": [ "patchwork-incoming@bilbo.ozlabs.org", "intel-wired-lan@lists.osuosl.org" ], "Authentication-Results": [ "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=osuosl.org\n\t(client-ip=140.211.166.133; helo=hemlock.osuosl.org;\n\tenvelope-from=intel-wired-lan-bounces@osuosl.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=intel.com" ], "Received": [ "from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 44kxVy6TW0z9s3Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 18 Apr 2019 08:19:54 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 2377187DDE;\n\tWed, 17 Apr 2019 22:19:53 +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 rMTkKnferoaj; Wed, 17 Apr 2019 22:19:49 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby hemlock.osuosl.org (Postfix) with ESMTP id 678FF87DCC;\n\tWed, 17 Apr 2019 22:19:49 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 523761BF405\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:48 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 4F4712EFBB\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:48 +0000 (UTC)", "from silver.osuosl.org ([127.0.0.1])\n\tby localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024)\n\twith ESMTP id FMBskXMWlk-D for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:42 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 2D1DE2EE62\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:42 +0000 (UTC)", "from orsmga006.jf.intel.com ([10.7.209.51])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t17 Apr 2019 15:19:40 -0700", "from alicemic-2.jf.intel.com ([10.166.16.121])\n\tby orsmga006.jf.intel.com with ESMTP; 17 Apr 2019 15:19:40 -0700" ], "X-Virus-Scanned": [ "amavisd-new at osuosl.org", "amavisd-new at osuosl.org" ], "X-Greylist": "domain auto-whitelisted by SQLgrey-1.7.6", "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.60,363,1549958400\"; d=\"scan'208\";a=\"136697256\"", "From": "Alice Michael <alice.michael@intel.com>", "To": "alice.michael@intel.com,\n\tintel-wired-lan@lists.osuosl.org", "Date": "Wed, 17 Apr 2019 15:17:35 -0700", "Message-Id": "<20190417221737.11460-7-alice.michael@intel.com>", "X-Mailer": "git-send-email 2.19.2", "In-Reply-To": "<20190417221737.11460-1-alice.michael@intel.com>", "References": "<20190417221737.11460-1-alice.michael@intel.com>", "MIME-Version": "1.0", "Subject": "[Intel-wired-lan] [next PATCH S4 iavf 7/9] iavf: change remaining\n\ti40e defines to be iavf", "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": "There were a couple of eroneously missed i40e names to\nupdate to iavf left after the larger chunks. Updated them\nseperately so now they should all be aligned as iavf.\n\nSigned-off-by: Alice Michael <alice.michael@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf_adminq.c | 96 +++++++++----------\n drivers/net/ethernet/intel/iavf/iavf_adminq.h | 4 +-\n drivers/net/ethernet/intel/iavf/iavf_type.h | 2 +-\n 3 files changed, 51 insertions(+), 51 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq.c b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\nindex a764eb9838d1..9fa3fa99b4c2 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n@@ -29,10 +29,10 @@ static void iavf_adminq_init_regs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings\n+ * iavf_alloc_adminq_asq_ring - Allocate Admin Queue send rings\n * @hw: pointer to the hardware structure\n **/\n-static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n+static enum iavf_status iavf_alloc_adminq_asq_ring(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code;\n \n@@ -56,10 +56,10 @@ static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings\n+ * iavf_alloc_adminq_arq_ring - Allocate Admin Queue receive rings\n * @hw: pointer to the hardware structure\n **/\n-static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)\n+static enum iavf_status iavf_alloc_adminq_arq_ring(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code;\n \n@@ -73,34 +73,34 @@ static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_free_adminq_asq - Free Admin Queue send rings\n+ * iavf_free_adminq_asq - Free Admin Queue send rings\n * @hw: pointer to the hardware structure\n *\n * This assumes the posted send buffers have already been cleaned\n * and de-allocated\n **/\n-static void i40e_free_adminq_asq(struct iavf_hw *hw)\n+static void iavf_free_adminq_asq(struct iavf_hw *hw)\n {\n \tiavf_free_dma_mem(hw, &hw->aq.asq.desc_buf);\n }\n \n /**\n- * i40e_free_adminq_arq - Free Admin Queue receive rings\n+ * iavf_free_adminq_arq - Free Admin Queue receive rings\n * @hw: pointer to the hardware structure\n *\n * This assumes the posted receive buffers have already been cleaned\n * and de-allocated\n **/\n-static void i40e_free_adminq_arq(struct iavf_hw *hw)\n+static void iavf_free_adminq_arq(struct iavf_hw *hw)\n {\n \tiavf_free_dma_mem(hw, &hw->aq.arq.desc_buf);\n }\n \n /**\n- * i40e_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue\n+ * iavf_alloc_arq_bufs - Allocate pre-posted buffers for the receive queue\n * @hw: pointer to the hardware structure\n **/\n-static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)\n+static enum iavf_status iavf_alloc_arq_bufs(struct iavf_hw *hw)\n {\n \tstruct iavf_aq_desc *desc;\n \tstruct iavf_dma_mem *bi;\n@@ -165,10 +165,10 @@ static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_alloc_asq_bufs - Allocate empty buffer structs for the send queue\n+ * iavf_alloc_asq_bufs - Allocate empty buffer structs for the send queue\n * @hw: pointer to the hardware structure\n **/\n-static enum iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)\n+static enum iavf_status iavf_alloc_asq_bufs(struct iavf_hw *hw)\n {\n \tstruct iavf_dma_mem *bi;\n \tenum iavf_status ret_code;\n@@ -206,10 +206,10 @@ static enum iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_free_arq_bufs - Free receive queue buffer info elements\n+ * iavf_free_arq_bufs - Free receive queue buffer info elements\n * @hw: pointer to the hardware structure\n **/\n-static void i40e_free_arq_bufs(struct iavf_hw *hw)\n+static void iavf_free_arq_bufs(struct iavf_hw *hw)\n {\n \tint i;\n \n@@ -225,10 +225,10 @@ static void i40e_free_arq_bufs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_free_asq_bufs - Free send queue buffer info elements\n+ * iavf_free_asq_bufs - Free send queue buffer info elements\n * @hw: pointer to the hardware structure\n **/\n-static void i40e_free_asq_bufs(struct iavf_hw *hw)\n+static void iavf_free_asq_bufs(struct iavf_hw *hw)\n {\n \tint i;\n \n@@ -248,12 +248,12 @@ static void i40e_free_asq_bufs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_config_asq_regs - configure ASQ registers\n+ * iavf_config_asq_regs - configure ASQ registers\n * @hw: pointer to the hardware structure\n *\n * Configure base address and length registers for the transmit queue\n **/\n-static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n+static enum iavf_status iavf_config_asq_regs(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \tu32 reg = 0;\n@@ -277,12 +277,12 @@ static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_config_arq_regs - ARQ register configuration\n+ * iavf_config_arq_regs - ARQ register configuration\n * @hw: pointer to the hardware structure\n *\n * Configure base address and length registers for the receive (event queue)\n **/\n-static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n+static enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \tu32 reg = 0;\n@@ -309,7 +309,7 @@ static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_init_asq - main initialization routine for ASQ\n+ * iavf_init_asq - main initialization routine for ASQ\n * @hw: pointer to the hardware structure\n *\n * This is the main initialization routine for the Admin Send Queue\n@@ -321,7 +321,7 @@ static enum iavf_status i40e_config_arq_regs(struct iavf_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 enum iavf_status i40e_init_asq(struct iavf_hw *hw)\n+static enum iavf_status iavf_init_asq(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \n@@ -342,17 +342,17 @@ static enum iavf_status i40e_init_asq(struct iavf_hw *hw)\n \thw->aq.asq.next_to_clean = 0;\n \n \t/* allocate the ring memory */\n-\tret_code = i40e_alloc_adminq_asq_ring(hw);\n+\tret_code = iavf_alloc_adminq_asq_ring(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_exit;\n \n \t/* allocate buffers in the rings */\n-\tret_code = i40e_alloc_asq_bufs(hw);\n+\tret_code = iavf_alloc_asq_bufs(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_free_rings;\n \n \t/* initialize base registers */\n-\tret_code = i40e_config_asq_regs(hw);\n+\tret_code = iavf_config_asq_regs(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_free_rings;\n \n@@ -361,14 +361,14 @@ static enum iavf_status i40e_init_asq(struct iavf_hw *hw)\n \tgoto init_adminq_exit;\n \n init_adminq_free_rings:\n-\ti40e_free_adminq_asq(hw);\n+\tiavf_free_adminq_asq(hw);\n \n init_adminq_exit:\n \treturn ret_code;\n }\n \n /**\n- * i40e_init_arq - initialize ARQ\n+ * iavf_init_arq - initialize ARQ\n * @hw: pointer to the hardware structure\n *\n * The main initialization routine for the Admin Receive (Event) Queue.\n@@ -380,7 +380,7 @@ static enum iavf_status i40e_init_asq(struct iavf_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 enum iavf_status i40e_init_arq(struct iavf_hw *hw)\n+static enum iavf_status iavf_init_arq(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \n@@ -401,17 +401,17 @@ static enum iavf_status i40e_init_arq(struct iavf_hw *hw)\n \thw->aq.arq.next_to_clean = 0;\n \n \t/* allocate the ring memory */\n-\tret_code = i40e_alloc_adminq_arq_ring(hw);\n+\tret_code = iavf_alloc_adminq_arq_ring(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_exit;\n \n \t/* allocate buffers in the rings */\n-\tret_code = i40e_alloc_arq_bufs(hw);\n+\tret_code = iavf_alloc_arq_bufs(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_free_rings;\n \n \t/* initialize base registers */\n-\tret_code = i40e_config_arq_regs(hw);\n+\tret_code = iavf_config_arq_regs(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_free_rings;\n \n@@ -420,19 +420,19 @@ static enum iavf_status i40e_init_arq(struct iavf_hw *hw)\n \tgoto init_adminq_exit;\n \n init_adminq_free_rings:\n-\ti40e_free_adminq_arq(hw);\n+\tiavf_free_adminq_arq(hw);\n \n init_adminq_exit:\n \treturn ret_code;\n }\n \n /**\n- * i40e_shutdown_asq - shutdown the ASQ\n+ * iavf_shutdown_asq - shutdown the ASQ\n * @hw: pointer to the hardware structure\n *\n * The main shutdown routine for the Admin Send Queue\n **/\n-static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n+static enum iavf_status iavf_shutdown_asq(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \n@@ -453,7 +453,7 @@ static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n \thw->aq.asq.count = 0; /* to indicate uninitialized queue */\n \n \t/* free ring buffers */\n-\ti40e_free_asq_bufs(hw);\n+\tiavf_free_asq_bufs(hw);\n \n shutdown_asq_out:\n \tmutex_unlock(&hw->aq.asq_mutex);\n@@ -461,12 +461,12 @@ static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n }\n \n /**\n- * i40e_shutdown_arq - shutdown ARQ\n+ * iavf_shutdown_arq - shutdown ARQ\n * @hw: pointer to the hardware structure\n *\n * The main shutdown routine for the Admin Receive Queue\n **/\n-static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n+static enum iavf_status iavf_shutdown_arq(struct iavf_hw *hw)\n {\n \tenum iavf_status ret_code = 0;\n \n@@ -487,7 +487,7 @@ static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n \thw->aq.arq.count = 0; /* to indicate uninitialized queue */\n \n \t/* free ring buffers */\n-\ti40e_free_arq_bufs(hw);\n+\tiavf_free_arq_bufs(hw);\n \n shutdown_arq_out:\n \tmutex_unlock(&hw->aq.arq_mutex);\n@@ -525,12 +525,12 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw)\n \thw->aq.asq_cmd_timeout = IAVF_ASQ_CMD_TIMEOUT;\n \n \t/* allocate the ASQ */\n-\tret_code = i40e_init_asq(hw);\n+\tret_code = iavf_init_asq(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_destroy_locks;\n \n \t/* allocate the ARQ */\n-\tret_code = i40e_init_arq(hw);\n+\tret_code = iavf_init_arq(hw);\n \tif (ret_code)\n \t\tgoto init_adminq_free_asq;\n \n@@ -538,7 +538,7 @@ enum iavf_status iavf_init_adminq(struct iavf_hw *hw)\n \tgoto init_adminq_exit;\n \n init_adminq_free_asq:\n-\ti40e_shutdown_asq(hw);\n+\tiavf_shutdown_asq(hw);\n init_adminq_destroy_locks:\n \n init_adminq_exit:\n@@ -556,19 +556,19 @@ enum iavf_status iavf_shutdown_adminq(struct iavf_hw *hw)\n \tif (iavf_check_asq_alive(hw))\n \t\tiavf_aq_queue_shutdown(hw, true);\n \n-\ti40e_shutdown_asq(hw);\n-\ti40e_shutdown_arq(hw);\n+\tiavf_shutdown_asq(hw);\n+\tiavf_shutdown_arq(hw);\n \n \treturn ret_code;\n }\n \n /**\n- * i40e_clean_asq - cleans Admin send queue\n+ * iavf_clean_asq - cleans Admin send queue\n * @hw: pointer to the hardware structure\n *\n * returns the number of free desc\n **/\n-static u16 i40e_clean_asq(struct iavf_hw *hw)\n+static u16 iavf_clean_asq(struct iavf_hw *hw)\n {\n \tstruct iavf_adminq_ring *asq = &hw->aq.asq;\n \tstruct iavf_asq_cmd_details *details;\n@@ -583,8 +583,8 @@ static u16 i40e_clean_asq(struct iavf_hw *hw)\n \t\t\t \"ntc %d head %d.\\n\", ntc, rd32(hw, hw->aq.asq.head));\n \n \t\tif (details->callback) {\n-\t\t\tI40E_ADMINQ_CALLBACK cb_func =\n-\t\t\t\t\t(I40E_ADMINQ_CALLBACK)details->callback;\n+\t\t\tIAVF_ADMINQ_CALLBACK cb_func =\n+\t\t\t\t\t(IAVF_ADMINQ_CALLBACK)details->callback;\n \t\t\tdesc_cb = *desc;\n \t\t\tcb_func(hw, &desc_cb);\n \t\t}\n@@ -708,7 +708,7 @@ enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n \t/* the clean function called here could be called in a separate thread\n \t * in case of asynchronous completions\n \t */\n-\tif (i40e_clean_asq(hw) == 0) {\n+\tif (iavf_clean_asq(hw) == 0) {\n \t\tiavf_debug(hw,\n \t\t\t IAVF_DEBUG_AQ_MESSAGE,\n \t\t\t \"AQTX: Error queue is full.\\n\");\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq.h b/drivers/net/ethernet/intel/iavf/iavf_adminq.h\nindex 300320e034d2..baf2fe26f302 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.h\n@@ -84,11 +84,11 @@ struct iavf_adminq_info {\n };\n \n /**\n- * i40e_aq_rc_to_posix - convert errors to user-land codes\n+ * iavf_aq_rc_to_posix - convert errors to user-land codes\n * aq_ret: AdminQ handler error code can override aq_rc\n * aq_rc: AdminQ firmware error code to convert\n **/\n-static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc)\n+static inline int iavf_aq_rc_to_posix(int aq_ret, int aq_rc)\n {\n \tint aq_to_posix[] = {\n \t\t0, /* IAVF_AQ_RC_OK */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_type.h b/drivers/net/ethernet/intel/iavf/iavf_type.h\nindex 4bc05d2837d7..7190a40c540c 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_type.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_type.h\n@@ -21,7 +21,7 @@\n \n /* forward declaration */\n struct iavf_hw;\n-typedef void (*I40E_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);\n+typedef void (*IAVF_ADMINQ_CALLBACK)(struct iavf_hw *, struct iavf_aq_desc *);\n \n /* Data type manipulation macros. */\n \n", "prefixes": [ "next", "S4", "iavf", "7/9" ] }