Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1087277/?format=api
{ "id": 1087277, "url": "http://patchwork.ozlabs.org/api/patches/1087277/?format=api", "web_url": "http://patchwork.ozlabs.org/project/intel-wired-lan/patch/20190417221737.11460-2-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-2-alice.michael@intel.com>", "list_archive_url": null, "date": "2019-04-17T22:17:30", "name": "[next,S4,iavf,2/9] iavf: change iavf_status_code to iavf_status", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "e9119befd732a6785772a2758ae0e8289e5742f0", "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-2-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/1087277/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1087277/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.137; helo=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 44kxW525vnz9s3Z\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 18 Apr 2019 08:20:01 +1000 (AEST)", "from localhost (localhost [127.0.0.1])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id B40B3861C9;\n\tWed, 17 Apr 2019 22:19:59 +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 y0nLKDwxtFHG; Wed, 17 Apr 2019 22:19:55 +0000 (UTC)", "from ash.osuosl.org (ash.osuosl.org [140.211.166.34])\n\tby fraxinus.osuosl.org (Postfix) with ESMTP id 4F890861F6;\n\tWed, 17 Apr 2019 22:19:54 +0000 (UTC)", "from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136])\n\tby ash.osuosl.org (Postfix) with ESMTP id 881301BF405\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:53 +0000 (UTC)", "from localhost (localhost [127.0.0.1])\n\tby silver.osuosl.org (Postfix) with ESMTP id 851412ECA9\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:53 +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 NuIAONdk3mXJ for <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:41 +0000 (UTC)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby silver.osuosl.org (Postfix) with ESMTPS id 781632E6B2\n\tfor <intel-wired-lan@lists.osuosl.org>;\n\tWed, 17 Apr 2019 22:19:41 +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=\"136697238\"", "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:30 -0700", "Message-Id": "<20190417221737.11460-2-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 2/9] iavf: change\n\tiavf_status_code to iavf_status", "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: Sergey Nemov <sergey.nemov@intel.com>\n\nInstead of typedefing the enum iavf_status_code with iavf_status,\njust shorten the enum itself and get rid of typedef.\n\nSigned-off-by: Sergey Nemov <sergey.nemov@intel.com>\n---\n drivers/net/ethernet/intel/iavf/iavf.h | 2 +-\n drivers/net/ethernet/intel/iavf/iavf_adminq.c | 67 ++++++++++---------\n drivers/net/ethernet/intel/iavf/iavf_alloc.h | 17 +++--\n drivers/net/ethernet/intel/iavf/iavf_client.c | 6 +-\n drivers/net/ethernet/intel/iavf/iavf_common.c | 53 ++++++++-------\n drivers/net/ethernet/intel/iavf/iavf_main.c | 20 +++---\n drivers/net/ethernet/intel/iavf/iavf_osdep.h | 1 -\n .../net/ethernet/intel/iavf/iavf_prototype.h | 52 +++++++-------\n drivers/net/ethernet/intel/iavf/iavf_status.h | 2 +-\n .../net/ethernet/intel/iavf/iavf_virtchnl.c | 14 ++--\n 10 files changed, 121 insertions(+), 113 deletions(-)", "diff": "diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h\nindex 272d76b733aa..42118f63f4f0 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf.h\n@@ -402,7 +402,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 enum virtchnl_ops v_opcode,\n-\t\t\t iavf_status v_retval, u8 *msg, u16 msglen);\n+\t\t\t enum iavf_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/iavf_adminq.c b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\nindex 04b44614ec38..22d3b79a6049 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.c\n@@ -32,9 +32,9 @@ static void i40e_adminq_init_regs(struct iavf_hw *hw)\n * i40e_alloc_adminq_asq_ring - Allocate Admin Queue send rings\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n+static enum iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code;\n+\tenum iavf_status ret_code;\n \n \tret_code = iavf_allocate_dma_mem(hw, &hw->aq.asq.desc_buf,\n \t\t\t\t\t i40e_mem_atq_ring,\n@@ -59,9 +59,9 @@ static iavf_status i40e_alloc_adminq_asq_ring(struct iavf_hw *hw)\n * i40e_alloc_adminq_arq_ring - Allocate Admin Queue receive rings\n * @hw: pointer to the hardware structure\n **/\n-static iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)\n+static enum iavf_status i40e_alloc_adminq_arq_ring(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code;\n+\tenum iavf_status ret_code;\n \n \tret_code = iavf_allocate_dma_mem(hw, &hw->aq.arq.desc_buf,\n \t\t\t\t\t i40e_mem_arq_ring,\n@@ -100,11 +100,11 @@ static void i40e_free_adminq_arq(struct iavf_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 iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)\n+static enum iavf_status i40e_alloc_arq_bufs(struct iavf_hw *hw)\n {\n \tstruct i40e_aq_desc *desc;\n \tstruct iavf_dma_mem *bi;\n-\tiavf_status ret_code;\n+\tenum iavf_status ret_code;\n \tint i;\n \n \t/* We'll be allocating the buffer info memory first, then we can\n@@ -168,10 +168,10 @@ static iavf_status i40e_alloc_arq_bufs(struct iavf_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 iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)\n+static enum iavf_status i40e_alloc_asq_bufs(struct iavf_hw *hw)\n {\n \tstruct iavf_dma_mem *bi;\n-\tiavf_status ret_code;\n+\tenum iavf_status ret_code;\n \tint i;\n \n \t/* No mapped memory needed yet, just the buffer info structures */\n@@ -253,9 +253,9 @@ static void i40e_free_asq_bufs(struct iavf_hw *hw)\n *\n * Configure base address and length registers for the transmit queue\n **/\n-static iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n+static enum iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \tu32 reg = 0;\n \n \t/* Clear Head and Tail */\n@@ -282,9 +282,9 @@ static iavf_status i40e_config_asq_regs(struct iavf_hw *hw)\n *\n * Configure base address and length registers for the receive (event queue)\n **/\n-static iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n+static enum iavf_status i40e_config_arq_regs(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \tu32 reg = 0;\n \n \t/* Clear Head and Tail */\n@@ -321,9 +321,9 @@ static 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 iavf_status i40e_init_asq(struct iavf_hw *hw)\n+static enum iavf_status i40e_init_asq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \n \tif (hw->aq.asq.count > 0) {\n \t\t/* queue already initialized */\n@@ -380,9 +380,9 @@ static 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 iavf_status i40e_init_arq(struct iavf_hw *hw)\n+static enum iavf_status i40e_init_arq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \n \tif (hw->aq.arq.count > 0) {\n \t\t/* queue already initialized */\n@@ -432,9 +432,9 @@ static iavf_status i40e_init_arq(struct iavf_hw *hw)\n *\n * The main shutdown routine for the Admin Send Queue\n **/\n-static iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n+static enum iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \n \tmutex_lock(&hw->aq.asq_mutex);\n \n@@ -466,9 +466,9 @@ static iavf_status i40e_shutdown_asq(struct iavf_hw *hw)\n *\n * The main shutdown routine for the Admin Receive Queue\n **/\n-static iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n+static enum iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \n \tmutex_lock(&hw->aq.arq_mutex);\n \n@@ -505,9 +505,9 @@ static iavf_status i40e_shutdown_arq(struct iavf_hw *hw)\n * - hw->aq.arq_buf_size\n * - hw->aq.asq_buf_size\n **/\n-iavf_status iavf_init_adminq(struct iavf_hw *hw)\n+enum iavf_status iavf_init_adminq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code;\n+\tenum iavf_status ret_code;\n \n \t/* verify input for valid configuration */\n \tif ((hw->aq.num_arq_entries == 0) ||\n@@ -549,9 +549,9 @@ iavf_status iavf_init_adminq(struct iavf_hw *hw)\n * iavf_shutdown_adminq - shutdown routine for the Admin Queue\n * @hw: pointer to the hardware structure\n **/\n-iavf_status iavf_shutdown_adminq(struct iavf_hw *hw)\n+enum iavf_status iavf_shutdown_adminq(struct iavf_hw *hw)\n {\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \n \tif (iavf_check_asq_alive(hw))\n \t\tiavf_aq_queue_shutdown(hw, true);\n@@ -629,16 +629,17 @@ bool iavf_asq_done(struct iavf_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-iavf_status iavf_asq_send_command(struct iavf_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+enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n+\t\t\t\t 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 \tstruct iavf_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+\tenum iavf_status status = 0;\n \tu16 retval = 0;\n \tu32 val = 0;\n \n@@ -841,13 +842,13 @@ void iavf_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc, u16 opcode)\n * the contents through e. It can also return how many events are\n * left to process through 'pending'\n **/\n-iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n-\t\t\t\t struct i40e_arq_event_info *e,\n-\t\t\t\t u16 *pending)\n+enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n+\t\t\t\t\tstruct i40e_arq_event_info *e,\n+\t\t\t\t\tu16 *pending)\n {\n \tu16 ntc = hw->aq.arq.next_to_clean;\n \tstruct i40e_aq_desc *desc;\n-\tiavf_status ret_code = 0;\n+\tenum iavf_status ret_code = 0;\n \tstruct iavf_dma_mem *bi;\n \tu16 desc_idx;\n \tu16 datalen;\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_alloc.h b/drivers/net/ethernet/intel/iavf/iavf_alloc.h\nindex bf2753146f30..2711573c14ec 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_alloc.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_alloc.h\n@@ -20,12 +20,15 @@ enum iavf_memory_type {\n };\n \n /* prototype for functions used for dynamic memory allocation */\n-iavf_status iavf_allocate_dma_mem(struct iavf_hw *hw, struct iavf_dma_mem *mem,\n-\t\t\t\t enum iavf_memory_type type,\n-\t\t\t\t u64 size, u32 alignment);\n-iavf_status iavf_free_dma_mem(struct iavf_hw *hw, struct iavf_dma_mem *mem);\n-iavf_status iavf_allocate_virt_mem(struct iavf_hw *hw,\n-\t\t\t\t struct iavf_virt_mem *mem, u32 size);\n-iavf_status iavf_free_virt_mem(struct iavf_hw *hw, struct iavf_virt_mem *mem);\n+enum iavf_status iavf_allocate_dma_mem(struct iavf_hw *hw,\n+\t\t\t\t struct iavf_dma_mem *mem,\n+\t\t\t\t enum iavf_memory_type type,\n+\t\t\t\t u64 size, u32 alignment);\n+enum iavf_status iavf_free_dma_mem(struct iavf_hw *hw,\n+\t\t\t\t struct iavf_dma_mem *mem);\n+enum iavf_status iavf_allocate_virt_mem(struct iavf_hw *hw,\n+\t\t\t\t\tstruct iavf_virt_mem *mem, u32 size);\n+enum iavf_status iavf_free_virt_mem(struct iavf_hw *hw,\n+\t\t\t\t struct iavf_virt_mem *mem);\n \n #endif /* _IAVF_ALLOC_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_client.c b/drivers/net/ethernet/intel/iavf/iavf_client.c\nindex ab9db7e9f09d..3cdcaac75b70 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_client.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_client.c\n@@ -135,7 +135,7 @@ void iavf_notify_client_open(struct iavf_vsi *vsi)\n static int iavf_client_release_qvlist(struct i40e_info *ldev)\n {\n \tstruct iavf_adapter *adapter = ldev->vf;\n-\tiavf_status err;\n+\tenum iavf_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-\tiavf_status err;\n+\tenum iavf_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-\tiavf_status err;\n+\tenum iavf_status err;\n \tu32 v_idx, i;\n \tsize_t msg_size;\n \ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c\nindex d9d9f6060353..44cd15793bb5 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_common.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_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-iavf_status iavf_set_mac_type(struct iavf_hw *hw)\n+enum iavf_status iavf_set_mac_type(struct iavf_hw *hw)\n {\n-\tiavf_status status = 0;\n+\tenum iavf_status status = 0;\n \n \tif (hw->vendor_id == PCI_VENDOR_ID_INTEL) {\n \t\tswitch (hw->device_id) {\n@@ -104,7 +104,7 @@ const char *iavf_aq_str(struct iavf_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 iavf_hw *hw, iavf_status stat_err)\n+const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err)\n {\n \tswitch (stat_err) {\n \tcase 0:\n@@ -327,12 +327,12 @@ bool iavf_check_asq_alive(struct iavf_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-iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading)\n+enum iavf_status iavf_aq_queue_shutdown(struct iavf_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-\tiavf_status status;\n+\tenum iavf_status status;\n \n \tiavf_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_queue_shutdown);\n \n@@ -354,12 +354,12 @@ iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading)\n *\n * Internal function to get or set RSS look up table\n **/\n-static iavf_status iavf_aq_get_set_rss_lut(struct iavf_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+static enum iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw,\n+\t\t\t\t\t\tu16 vsi_id, bool pf_lut,\n+\t\t\t\t\t\tu8 *lut, u16 lut_size,\n+\t\t\t\t\t\tbool set)\n {\n-\tiavf_status status;\n+\tenum iavf_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@@ -407,8 +407,8 @@ static iavf_status iavf_aq_get_set_rss_lut(struct iavf_hw *hw,\n *\n * get the RSS lookup table, PF or VSI type\n **/\n-iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n-\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n+enum iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n+\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn iavf_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size,\n \t\t\t\t false);\n@@ -424,8 +424,8 @@ iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n *\n * set the RSS lookup table, PF or VSI type\n **/\n-iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n-\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size)\n+enum iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n+\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size)\n {\n \treturn iavf_aq_get_set_rss_lut(hw, vsi_id, pf_lut, lut, lut_size, true);\n }\n@@ -439,12 +439,12 @@ iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 vsi_id,\n *\n * get the RSS key per VSI\n **/\n-static\n+static enum\n iavf_status iavf_aq_get_set_rss_key(struct iavf_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-\tiavf_status status;\n+\tenum iavf_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@@ -479,8 +479,8 @@ iavf_status iavf_aq_get_set_rss_key(struct iavf_hw *hw, u16 vsi_id,\n * @key: pointer to key info struct\n *\n **/\n-iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,\n-\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n+enum iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,\n+\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn iavf_aq_get_set_rss_key(hw, vsi_id, key, false);\n }\n@@ -493,8 +493,8 @@ iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 vsi_id,\n *\n * set the RSS key per VSI\n **/\n-iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id,\n-\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key)\n+enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id,\n+\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key)\n {\n \treturn iavf_aq_get_set_rss_key(hw, vsi_id, key, true);\n }\n@@ -877,14 +877,15 @@ struct iavf_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-iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n-\t\t\t\t enum virtchnl_ops v_opcode,\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+enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n+\t\t\t\t\tenum virtchnl_ops v_opcode,\n+\t\t\t\t\tenum iavf_status v_retval,\n+\t\t\t\t\tu8 *msg, u16 msglen,\n+\t\t\t\t\tstruct i40e_asq_cmd_details *cmd_details)\n {\n \tstruct i40e_asq_cmd_details details;\n \tstruct i40e_aq_desc desc;\n-\tiavf_status status;\n+\tenum iavf_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@@ -948,7 +949,7 @@ void iavf_vf_parse_hw_config(struct iavf_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-iavf_status iavf_vf_reset(struct iavf_hw *hw)\n+enum iavf_status iavf_vf_reset(struct iavf_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/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c\nindex 78340b297dab..ab4e3573f9db 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_main.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c\n@@ -66,9 +66,9 @@ static struct workqueue_struct *iavf_wq;\n * @size: size of memory requested\n * @alignment: what to align the allocation to\n **/\n-iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n-\t\t\t\t struct iavf_dma_mem *mem,\n-\t\t\t\t u64 size, u32 alignment)\n+enum iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n+\t\t\t\t\t struct iavf_dma_mem *mem,\n+\t\t\t\t\t u64 size, u32 alignment)\n {\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n@@ -89,7 +89,8 @@ iavf_status iavf_allocate_dma_mem_d(struct iavf_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw, struct iavf_dma_mem *mem)\n+enum iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw,\n+\t\t\t\t struct iavf_dma_mem *mem)\n {\n \tstruct iavf_adapter *adapter = (struct iavf_adapter *)hw->back;\n \n@@ -106,8 +107,8 @@ iavf_status iavf_free_dma_mem_d(struct iavf_hw *hw, struct iavf_dma_mem *mem)\n * @mem: ptr to mem struct to fill out\n * @size: size of memory requested\n **/\n-iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n-\t\t\t\t struct iavf_virt_mem *mem, u32 size)\n+enum iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n+\t\t\t\t\t struct iavf_virt_mem *mem, u32 size)\n {\n \tif (!mem)\n \t\treturn I40E_ERR_PARAM;\n@@ -126,7 +127,8 @@ iavf_status iavf_allocate_virt_mem_d(struct iavf_hw *hw,\n * @hw: pointer to the HW structure\n * @mem: ptr to mem struct to free\n **/\n-iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw, struct iavf_virt_mem *mem)\n+enum iavf_status iavf_free_virt_mem_d(struct iavf_hw *hw,\n+\t\t\t\t struct iavf_virt_mem *mem)\n {\n \tif (!mem)\n \t\treturn I40E_ERR_PARAM;\n@@ -2022,7 +2024,7 @@ static void iavf_adminq_task(struct work_struct *work)\n \tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops v_op;\n-\tiavf_status ret, v_ret;\n+\tenum iavf_status ret, v_ret;\n \tu32 val, oldval;\n \tu16 pending;\n \n@@ -2037,7 +2039,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 = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n+\t\tv_ret = (enum 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/iavf_osdep.h b/drivers/net/ethernet/intel/iavf/iavf_osdep.h\nindex c90cafb526d0..d39684558597 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_osdep.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_osdep.h\n@@ -48,5 +48,4 @@ struct iavf_virt_mem {\n extern void iavf_debug_d(void *hw, u32 mask, char *fmt_str, ...)\n \t__printf(3, 4);\n \n-typedef enum iavf_status_code iavf_status;\n #endif /* _IAVF_OSDEP_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_prototype.h b/drivers/net/ethernet/intel/iavf/iavf_prototype.h\nindex d6685103af39..2ff49dc75e31 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_prototype.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_prototype.h\n@@ -16,16 +16,17 @@\n */\n \n /* adminq functions */\n-iavf_status iavf_init_adminq(struct iavf_hw *hw);\n-iavf_status iavf_shutdown_adminq(struct iavf_hw *hw);\n+enum iavf_status iavf_init_adminq(struct iavf_hw *hw);\n+enum iavf_status iavf_shutdown_adminq(struct iavf_hw *hw);\n void i40e_adminq_init_ring_data(struct iavf_hw *hw);\n-iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n-\t\t\t\t struct i40e_arq_event_info *e,\n-\t\t\t\t u16 *events_pending);\n-iavf_status iavf_asq_send_command(struct iavf_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+enum iavf_status iavf_clean_arq_element(struct iavf_hw *hw,\n+\t\t\t\t\tstruct i40e_arq_event_info *e,\n+\t\t\t\t\tu16 *events_pending);\n+enum iavf_status iavf_asq_send_command(struct iavf_hw *hw,\n+\t\t\t\t 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 bool iavf_asq_done(struct iavf_hw *hw);\n \n /* debug function for adminq */\n@@ -35,20 +36,20 @@ void iavf_debug_aq(struct iavf_hw *hw, enum iavf_debug_mask mask,\n void i40e_idle_aq(struct iavf_hw *hw);\n void iavf_resume_aq(struct iavf_hw *hw);\n bool iavf_check_asq_alive(struct iavf_hw *hw);\n-iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading);\n+enum iavf_status iavf_aq_queue_shutdown(struct iavf_hw *hw, bool unloading);\n const char *iavf_aq_str(struct iavf_hw *hw, enum i40e_admin_queue_err aq_err);\n-const char *iavf_stat_str(struct iavf_hw *hw, iavf_status stat_err);\n+const char *iavf_stat_str(struct iavf_hw *hw, enum iavf_status stat_err);\n \n-iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 seid,\n-\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size);\n-iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 seid,\n-\t\t\t\tbool pf_lut, u8 *lut, u16 lut_size);\n-iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 seid,\n-\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key);\n-iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 seid,\n-\t\t\t\tstruct i40e_aqc_get_set_rss_key_data *key);\n+enum iavf_status iavf_aq_get_rss_lut(struct iavf_hw *hw, u16 seid,\n+\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n+enum iavf_status iavf_aq_set_rss_lut(struct iavf_hw *hw, u16 seid,\n+\t\t\t\t bool pf_lut, u8 *lut, u16 lut_size);\n+enum iavf_status iavf_aq_get_rss_key(struct iavf_hw *hw, u16 seid,\n+\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n+enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 seid,\n+\t\t\t\t struct i40e_aqc_get_set_rss_key_data *key);\n \n-iavf_status iavf_set_mac_type(struct iavf_hw *hw);\n+enum iavf_status iavf_set_mac_type(struct iavf_hw *hw);\n \n extern struct iavf_rx_ptype_decoded iavf_ptype_lookup[];\n \n@@ -59,9 +60,10 @@ static inline struct iavf_rx_ptype_decoded decode_rx_desc_ptype(u8 ptype)\n \n void iavf_vf_parse_hw_config(struct iavf_hw *hw,\n \t\t\t struct virtchnl_vf_resource *msg);\n-iavf_status iavf_vf_reset(struct iavf_hw *hw);\n-iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n-\t\t\t\t enum virtchnl_ops v_opcode,\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+enum iavf_status iavf_vf_reset(struct iavf_hw *hw);\n+enum iavf_status iavf_aq_send_msg_to_pf(struct iavf_hw *hw,\n+\t\t\t\t\tenum virtchnl_ops v_opcode,\n+\t\t\t\t\tenum iavf_status v_retval,\n+\t\t\t\t\tu8 *msg, u16 msglen,\n+\t\t\t\t\tstruct i40e_asq_cmd_details *cmd_details);\n #endif /* _IAVF_PROTOTYPE_H_ */\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_status.h b/drivers/net/ethernet/intel/iavf/iavf_status.h\nindex 46742fab7b8c..95026298685d 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_status.h\n+++ b/drivers/net/ethernet/intel/iavf/iavf_status.h\n@@ -5,7 +5,7 @@\n #define _IAVF_STATUS_H_\n \n /* Error Codes */\n-enum iavf_status_code {\n+enum iavf_status {\n \tI40E_SUCCESS\t\t\t\t= 0,\n \tI40E_ERR_NVM\t\t\t\t= -1,\n \tI40E_ERR_NVM_CHECKSUM\t\t\t= -2,\ndiff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\nindex 357c74bc3265..95457869f249 100644\n--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c\n@@ -22,7 +22,7 @@ static int iavf_send_pf_msg(struct iavf_adapter *adapter,\n \t\t\t enum virtchnl_ops op, u8 *msg, u16 len)\n {\n \tstruct iavf_hw *hw = &adapter->hw;\n-\tiavf_status err;\n+\tenum iavf_status err;\n \n \tif (adapter->flags & IAVF_FLAG_PF_COMMS_FAILED)\n \t\treturn 0; /* nothing to see here, move along */\n@@ -69,7 +69,7 @@ int iavf_verify_api_ver(struct iavf_adapter *adapter)\n \tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n-\tiavf_status err;\n+\tenum iavf_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 = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n+\terr = (enum iavf_status)le32_to_cpu(event.desc.cookie_low);\n \tif (err)\n \t\tgoto out_alloc;\n \n@@ -191,7 +191,7 @@ int iavf_get_vf_config(struct iavf_adapter *adapter)\n \tstruct iavf_hw *hw = &adapter->hw;\n \tstruct i40e_arq_event_info event;\n \tenum virtchnl_ops op;\n-\tiavf_status err;\n+\tenum iavf_status err;\n \tu16 len;\n \n \tlen = sizeof(struct virtchnl_vf_resource) +\n@@ -216,7 +216,7 @@ int iavf_get_vf_config(struct iavf_adapter *adapter)\n \t\t\tbreak;\n \t}\n \n-\terr = (iavf_status)le32_to_cpu(event.desc.cookie_low);\n+\terr = (enum 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@@ -1184,8 +1184,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 enum virtchnl_ops v_opcode, iavf_status v_retval,\n-\t\t\t u8 *msg, u16 msglen)\n+\t\t\t enum virtchnl_ops v_opcode,\n+\t\t\t enum iavf_status v_retval, u8 *msg, u16 msglen)\n {\n \tstruct net_device *netdev = adapter->netdev;\n \n", "prefixes": [ "next", "S4", "iavf", "2/9" ] }