Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 105492,
    "url": "https://patches.dpdk.org/api/patches/105492/?format=api",
    "web_url": "https://patches.dpdk.org/project/dpdk/patch/31a7341b7ec6310dc99e712a37c001730e10f065.1640783513.git.songyl@ramaxel.com/",
    "project": {
        "id": 1,
        "url": "https://patches.dpdk.org/api/projects/1/?format=api",
        "name": "DPDK",
        "link_name": "dpdk",
        "list_id": "dev.dpdk.org",
        "list_email": "dev@dpdk.org",
        "web_url": "http://core.dpdk.org",
        "scm_url": "git://dpdk.org/dpdk",
        "webscm_url": "http://git.dpdk.org/dpdk",
        "list_archive_url": "https://inbox.dpdk.org/dev",
        "list_archive_url_format": "https://inbox.dpdk.org/dev/{}",
        "commit_url_format": ""
    },
    "msgid": "<31a7341b7ec6310dc99e712a37c001730e10f065.1640783513.git.songyl@ramaxel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/31a7341b7ec6310dc99e712a37c001730e10f065.1640783513.git.songyl@ramaxel.com",
    "date": "2021-12-29T13:37:54",
    "name": "[v5,26/26] net/spnic: Fix reviewers comments",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "8048e885a7b1a4d1070ee922cb3f848c74b8899f",
    "submitter": {
        "id": 2455,
        "url": "https://patches.dpdk.org/api/people/2455/?format=api",
        "name": "Yanling Song",
        "email": "songyl@ramaxel.com"
    },
    "delegate": null,
    "mbox": "https://patches.dpdk.org/project/dpdk/patch/31a7341b7ec6310dc99e712a37c001730e10f065.1640783513.git.songyl@ramaxel.com/mbox/",
    "series": [
        {
            "id": 21038,
            "url": "https://patches.dpdk.org/api/series/21038/?format=api",
            "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=21038",
            "date": "2021-12-29T13:37:28",
            "name": "Net/SPNIC: support SPNIC into DPDK 22.03",
            "version": 5,
            "mbox": "https://patches.dpdk.org/series/21038/mbox/"
        }
    ],
    "comments": "https://patches.dpdk.org/api/patches/105492/comments/",
    "check": "warning",
    "checks": "https://patches.dpdk.org/api/patches/105492/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@inbox.dpdk.org",
        "Delivered-To": "patchwork@inbox.dpdk.org",
        "Received": [
            "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id A353EA034D;\n\tWed, 29 Dec 2021 14:40:56 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3425141140;\n\tWed, 29 Dec 2021 14:39:21 +0100 (CET)",
            "from VLXDG1SPAM1.ramaxel.com (email.ramaxel.com [221.4.138.186])\n by mails.dpdk.org (Postfix) with ESMTP id 0893541140\n for <dev@dpdk.org>; Wed, 29 Dec 2021 14:39:18 +0100 (CET)",
            "from V12DG1MBS01.ramaxel.local (v12dg1mbs01.ramaxel.local\n [172.26.18.31])\n by VLXDG1SPAM1.ramaxel.com with ESMTPS id 1BTDc5JD070470\n (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL);\n Wed, 29 Dec 2021 21:38:05 +0800 (GMT-8)\n (envelope-from songyl@ramaxel.com)",
            "from localhost.localdomain (10.64.9.47) by V12DG1MBS01.ramaxel.local\n (172.26.18.31) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2308.14; Wed, 29\n Dec 2021 21:38:05 +0800"
        ],
        "From": "Yanling Song <songyl@ramaxel.com>",
        "To": "<dev@dpdk.org>",
        "CC": "<songyl@ramaxel.com>, <yanling.song@linux.dev>, <yanggan@ramaxel.com>,\n <xuyun@ramaxel.com>, <ferruh.yigit@intel.com>,\n <stephen@networkplumber.org>, <lihuisong@huawei.com>",
        "Subject": "[PATCH v5 26/26] net/spnic: Fix reviewers comments",
        "Date": "Wed, 29 Dec 2021 21:37:54 +0800",
        "Message-ID": "\n <31a7341b7ec6310dc99e712a37c001730e10f065.1640783513.git.songyl@ramaxel.com>",
        "X-Mailer": "git-send-email 2.17.1",
        "In-Reply-To": "<cover.1640783513.git.songyl@ramaxel.com>",
        "References": "<cover.1640783513.git.songyl@ramaxel.com>",
        "MIME-Version": "1.0",
        "Content-Type": "text/plain",
        "X-Originating-IP": "[10.64.9.47]",
        "X-ClientProxiedBy": "V12DG1MBS03.ramaxel.local (172.26.18.33) To\n V12DG1MBS01.ramaxel.local (172.26.18.31)",
        "X-DNSRBL": "",
        "X-MAIL": "VLXDG1SPAM1.ramaxel.com 1BTDc5JD070470",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.29",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>",
        "List-Archive": "<http://mails.dpdk.org/archives/dev/>",
        "List-Post": "<mailto:dev@dpdk.org>",
        "List-Help": "<mailto:dev-request@dpdk.org?subject=help>",
        "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org"
    },
    "content": "Fix reviewers comments:\n1. Remove temporary MACRO: RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS\n2. Do not use void* for keeping the type information\n\nSigned-off-by: Yanling Song <songyl@ramaxel.com>\n---\n drivers/net/spnic/base/spnic_cmdq.c      |  14 +--\n drivers/net/spnic/base/spnic_cmdq.h      |   6 +-\n drivers/net/spnic/base/spnic_hw_cfg.c    |  49 ++++------\n drivers/net/spnic/base/spnic_hw_cfg.h    |  16 ++--\n drivers/net/spnic/base/spnic_hw_comm.c   |  32 ++++---\n drivers/net/spnic/base/spnic_hw_comm.h   |  22 ++---\n drivers/net/spnic/base/spnic_hwdev.c     |   8 +-\n drivers/net/spnic/base/spnic_hwif.c      |  52 +++++------\n drivers/net/spnic/base/spnic_hwif.h      |  22 ++---\n drivers/net/spnic/base/spnic_mgmt.c      |   9 +-\n drivers/net/spnic/base/spnic_mgmt.h      |   4 +-\n drivers/net/spnic/base/spnic_nic_cfg.c   | 110 +++++++++++------------\n drivers/net/spnic/base/spnic_nic_cfg.h   |  84 ++++++++---------\n drivers/net/spnic/base/spnic_nic_event.c |  30 +++----\n drivers/net/spnic/base/spnic_nic_event.h |  10 +--\n drivers/net/spnic/base/spnic_wq.c        |   3 +-\n drivers/net/spnic/base/spnic_wq.h        |   2 +-\n drivers/net/spnic/spnic_ethdev.c         |  11 ++-\n drivers/net/spnic/spnic_io.c             |  34 +++----\n drivers/net/spnic/spnic_io.h             |  10 +--\n drivers/net/spnic/spnic_rx.c             |   4 +-\n drivers/net/spnic/spnic_tx.c             |   4 +-\n 22 files changed, 252 insertions(+), 284 deletions(-)",
    "diff": "diff --git a/drivers/net/spnic/base/spnic_cmdq.c b/drivers/net/spnic/base/spnic_cmdq.c\nindex b8950f91c2..62189d20a3 100644\n--- a/drivers/net/spnic/base/spnic_cmdq.c\n+++ b/drivers/net/spnic/base/spnic_cmdq.c\n@@ -160,9 +160,9 @@ bool spnic_cmdq_idle(struct spnic_cmdq *cmdq)\n \t\ttrue : false);\n }\n \n-struct spnic_cmd_buf *spnic_alloc_cmd_buf(void *hwdev)\n+struct spnic_cmd_buf *spnic_alloc_cmd_buf(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_cmdqs *cmdqs = ((struct spnic_hwdev *)hwdev)->cmdqs;\n+\tstruct spnic_cmdqs *cmdqs = hwdev->cmdqs;\n \tstruct spnic_cmd_buf *cmd_buf;\n \n \tcmd_buf = rte_zmalloc(NULL, sizeof(*cmd_buf), 0);\n@@ -491,7 +491,7 @@ static int cmdq_sync_cmd_detail_resp(struct spnic_cmdq *cmdq,\n \treturn err;\n }\n \n-static int cmdq_params_valid(void *hwdev, struct spnic_cmd_buf *buf_in)\n+static int cmdq_params_valid(struct spnic_hwdev *hwdev, struct spnic_cmd_buf *buf_in)\n {\n \tif (!buf_in || !hwdev) {\n \t\tPMD_DRV_LOG(ERR, \"Invalid CMDQ buffer or hwdev is NULL\");\n@@ -520,11 +520,11 @@ static int wait_cmdqs_enable(struct spnic_cmdqs *cmdqs)\n \treturn -EBUSY;\n }\n \n-int spnic_cmdq_direct_resp(void *hwdev, enum spnic_mod_type mod, u8 cmd,\n+int spnic_cmdq_direct_resp(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u8 cmd,\n \t\t\t   struct spnic_cmd_buf *buf_in, u64 *out_param,\n \t\t\t   u32 timeout)\n {\n-\tstruct spnic_cmdqs *cmdqs = ((struct spnic_hwdev *)hwdev)->cmdqs;\n+\tstruct spnic_cmdqs *cmdqs = hwdev->cmdqs;\n \tint err;\n \n \terr = cmdq_params_valid(hwdev, buf_in);\n@@ -543,11 +543,11 @@ int spnic_cmdq_direct_resp(void *hwdev, enum spnic_mod_type mod, u8 cmd,\n \t\t\t\t\t mod, cmd, buf_in, out_param, timeout);\n }\n \n-int spnic_cmdq_detail_resp(void *hwdev, enum spnic_mod_type mod, u8 cmd,\n+int spnic_cmdq_detail_resp(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u8 cmd,\n \t\t\t   struct spnic_cmd_buf *buf_in,\n \t\t\t   struct spnic_cmd_buf *buf_out, u32 timeout)\n {\n-\tstruct spnic_cmdqs *cmdqs = ((struct spnic_hwdev *)hwdev)->cmdqs;\n+\tstruct spnic_cmdqs *cmdqs = hwdev->cmdqs;\n \tint err;\n \n \terr = cmdq_params_valid(hwdev, buf_in);\ndiff --git a/drivers/net/spnic/base/spnic_cmdq.h b/drivers/net/spnic/base/spnic_cmdq.h\nindex 9a08262860..bee899361c 100644\n--- a/drivers/net/spnic/base/spnic_cmdq.h\n+++ b/drivers/net/spnic/base/spnic_cmdq.h\n@@ -225,7 +225,7 @@ int spnic_reinit_cmdq_ctxts(struct spnic_hwdev *hwdev);\n \n bool spnic_cmdq_idle(struct spnic_cmdq *cmdq);\n \n-struct spnic_cmd_buf *spnic_alloc_cmd_buf(void *hwdev);\n+struct spnic_cmd_buf *spnic_alloc_cmd_buf(struct spnic_hwdev *hwdev);\n \n void spnic_free_cmd_buf(struct spnic_cmd_buf *cmd_buf);\n \n@@ -233,11 +233,11 @@ void spnic_free_cmd_buf(struct spnic_cmd_buf *cmd_buf);\n  * PF/VF sends cmd to ucode by cmdq, and return 0 if success.\n  * timeout=0, use default timeout.\n  */\n-int spnic_cmdq_direct_resp(void *hwdev, enum spnic_mod_type mod, u8 cmd,\n+int spnic_cmdq_direct_resp(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u8 cmd,\n \t\t\t   struct spnic_cmd_buf *buf_in, u64 *out_param,\n \t\t\t   u32 timeout);\n \n-int spnic_cmdq_detail_resp(void *hwdev, enum spnic_mod_type mod, u8 cmd,\n+int spnic_cmdq_detail_resp(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u8 cmd,\n \t\t\t   struct spnic_cmd_buf *buf_in,\n \t\t\t   struct spnic_cmd_buf *buf_out, u32 timeout);\n \ndiff --git a/drivers/net/spnic/base/spnic_hw_cfg.c b/drivers/net/spnic/base/spnic_hw_cfg.c\nindex 36e87ffe40..cbc8b60779 100644\n--- a/drivers/net/spnic/base/spnic_hw_cfg.c\n+++ b/drivers/net/spnic/base/spnic_hw_cfg.c\n@@ -58,15 +58,15 @@ static void parse_l2nic_res_cap(struct service_cap *cap,\n \t\t    nic_cap->max_sqs, nic_cap->max_rqs);\n }\n \n-static void parse_dev_cap(struct spnic_hwdev *dev,\n+static void parse_dev_cap(struct spnic_hwdev *hwdev,\n \t\t\t  struct spnic_cfg_cmd_dev_cap *dev_cap,\n \t\t\t  enum func_type type)\n {\n-\tstruct service_cap *cap = &dev->cfg_mgmt->svc_cap;\n+\tstruct service_cap *cap = &hwdev->cfg_mgmt->svc_cap;\n \n \tparse_pub_res_cap(cap, dev_cap, type);\n \n-\tif (IS_NIC_TYPE(dev))\n+\tif (IS_NIC_TYPE(hwdev))\n \t\tparse_l2nic_res_cap(cap, dev_cap);\n }\n \n@@ -112,13 +112,11 @@ static int get_dev_cap(struct spnic_hwdev *hwdev)\n \treturn 0;\n }\n \n-int spnic_cfg_mbx_vf_proc_msg(void *hwdev, __rte_unused void *pri_handle, u16 cmd,\n+int spnic_cfg_mbx_vf_proc_msg(struct spnic_hwdev *hwdev, __rte_unused void *pri_handle, u16 cmd,\n \t\t\t__rte_unused void *buf_in, __rte_unused u16 in_size,\n \t\t\t__rte_unused void *buf_out, __rte_unused u16 *out_size)\n {\n-\tstruct spnic_hwdev *dev = hwdev;\n-\n-\tif (!dev)\n+\tif (!hwdev)\n \t\treturn -EINVAL;\n \n \tPMD_DRV_LOG(WARNING,\n@@ -127,9 +125,8 @@ int spnic_cfg_mbx_vf_proc_msg(void *hwdev, __rte_unused void *pri_handle, u16 cm\n \treturn 0;\n }\n \n-int spnic_init_capability(void *dev)\n+int spnic_init_capability(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *hwdev = (struct spnic_hwdev *)dev;\n \tstruct cfg_mgmt_info *cfg_mgmt = NULL;\n \tint err;\n \n@@ -151,9 +148,9 @@ int spnic_init_capability(void *dev)\n \treturn err;\n }\n \n-void spnic_free_capability(void *dev)\n+void spnic_free_capability(struct spnic_hwdev *hwdev)\n {\n-\trte_free(((struct spnic_hwdev *)dev)->cfg_mgmt);\n+\trte_free(hwdev->cfg_mgmt);\n }\n \n /* *\n@@ -162,51 +159,43 @@ void spnic_free_capability(void *dev)\n  * @retval true: function support nic\n  * @retval false: function not support nic\n  */\n-bool spnic_support_nic(void *hwdev)\n+bool spnic_support_nic(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *dev = (struct spnic_hwdev *)hwdev;\n-\n \tif (!hwdev)\n \t\treturn false;\n \n-\tif (!IS_NIC_TYPE(dev))\n+\tif (!IS_NIC_TYPE(hwdev))\n \t\treturn false;\n \n \treturn true;\n }\n \n-u16 spnic_func_max_sqs(void *hwdev)\n+u16 spnic_func_max_sqs(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *dev = hwdev;\n-\n-\tif (!dev) {\n+\tif (!hwdev) {\n \t\tPMD_DRV_LOG(INFO, \"Hwdev is NULL for getting max_sqs\");\n \t\treturn 0;\n \t}\n \n-\treturn dev->cfg_mgmt->svc_cap.nic_cap.max_sqs;\n+\treturn hwdev->cfg_mgmt->svc_cap.nic_cap.max_sqs;\n }\n \n-u16 spnic_func_max_rqs(void *hwdev)\n+u16 spnic_func_max_rqs(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *dev = hwdev;\n-\n-\tif (!dev) {\n+\tif (!hwdev) {\n \t\tPMD_DRV_LOG(INFO, \"Hwdev is NULL for getting max_rqs\");\n \t\treturn 0;\n \t}\n \n-\treturn dev->cfg_mgmt->svc_cap.nic_cap.max_rqs;\n+\treturn hwdev->cfg_mgmt->svc_cap.nic_cap.max_rqs;\n }\n \n-u8 spnic_physical_port_id(void *hwdev)\n+u8 spnic_physical_port_id(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *dev = hwdev;\n-\n-\tif (!dev) {\n+\tif (!hwdev) {\n \t\tPMD_DRV_LOG(INFO, \"Hwdev is NULL for getting physical port id\");\n \t\treturn 0;\n \t}\n \n-\treturn dev->cfg_mgmt->svc_cap.port_id;\n+\treturn hwdev->cfg_mgmt->svc_cap.port_id;\n }\ndiff --git a/drivers/net/spnic/base/spnic_hw_cfg.h b/drivers/net/spnic/base/spnic_hw_cfg.h\nindex cf2b2ded01..4fbed02574 100644\n--- a/drivers/net/spnic/base/spnic_hw_cfg.h\n+++ b/drivers/net/spnic/base/spnic_hw_cfg.h\n@@ -60,7 +60,7 @@ struct service_cap {\n };\n \n struct cfg_mgmt_info {\n-\tvoid *hwdev;\n+\tstruct spnic_hwdev *hwdev;\n \tstruct service_cap svc_cap;\n };\n \n@@ -109,17 +109,17 @@ struct spnic_cfg_cmd_dev_cap {\n #define IS_NIC_TYPE(dev) \\\n \t(((u32)(dev)->cfg_mgmt->svc_cap.chip_svc_type) & CFG_SVC_NIC_BIT0)\n \n-int spnic_init_capability(void *dev);\n-void spnic_free_capability(void *dev);\n+int spnic_init_capability(struct spnic_hwdev *hwdev);\n+void spnic_free_capability(struct spnic_hwdev *hwdev);\n \n-u16 spnic_func_max_sqs(void *hwdev);\n-u16 spnic_func_max_rqs(void *hwdev);\n+u16 spnic_func_max_sqs(struct spnic_hwdev *hwdev);\n+u16 spnic_func_max_rqs(struct spnic_hwdev *hwdev);\n \n-u8 spnic_physical_port_id(void *hwdev);\n+u8 spnic_physical_port_id(struct spnic_hwdev *hwdev);\n \n-int spnic_cfg_mbx_vf_proc_msg(void *hwdev, void *pri_handle, u16 cmd, void *buf_in,\n+int spnic_cfg_mbx_vf_proc_msg(struct spnic_hwdev *hwdev, void *pri_handle, u16 cmd, void *buf_in,\n \t\t\tu16 in_size, void *buf_out, u16 *out_size);\n \n-bool spnic_support_nic(void *hwdev);\n+bool spnic_support_nic(struct spnic_hwdev *hwdev);\n \n #endif /* _SPNIC_HW_CFG_H_ */\ndiff --git a/drivers/net/spnic/base/spnic_hw_comm.c b/drivers/net/spnic/base/spnic_hw_comm.c\nindex 1c751f2403..3eb2854d0f 100644\n--- a/drivers/net/spnic/base/spnic_hw_comm.c\n+++ b/drivers/net/spnic/base/spnic_hw_comm.c\n@@ -69,9 +69,8 @@ const u32 spnic_hw_rx_buf_size[] = {\n \tSPNIC_RX_BUF_SIZE_16K,\n };\n \n-int spnic_get_interrupt_cfg(void *dev, struct interrupt_info *info)\n+int spnic_get_interrupt_cfg(struct spnic_hwdev *hwdev, struct interrupt_info *info)\n {\n-\tstruct spnic_hwdev *hwdev = dev;\n \tstruct spnic_cmd_msix_config msix_cfg;\n \tu16 out_size = sizeof(msix_cfg);\n \tint err;\n@@ -107,17 +106,16 @@ int spnic_get_interrupt_cfg(void *dev, struct interrupt_info *info)\n /**\n  * Set interrupt cfg\n  *\n- * @param[in] dev\n- *   The pointer to the private hardware device object\n+ * @param[in] hwdev\n+ *   The device pointer to hwdev\n  * @param[in] info\n  *   Interrupt info\n  *\n  * @retval zero : Success\n  * @retval negative : Failure.\n  */\n-int spnic_set_interrupt_cfg(void *dev, struct interrupt_info info)\n+int spnic_set_interrupt_cfg(struct spnic_hwdev *hwdev, struct interrupt_info info)\n {\n-\tstruct spnic_hwdev *hwdev = dev;\n \tstruct spnic_cmd_msix_config msix_cfg;\n \tstruct interrupt_info temp_info;\n \tu16 out_size = sizeof(msix_cfg);\n@@ -167,7 +165,7 @@ int spnic_set_interrupt_cfg(void *dev, struct interrupt_info info)\n \treturn 0;\n }\n \n-int spnic_set_wq_page_size(void *hwdev, u16 func_idx, u32 page_size)\n+int spnic_set_wq_page_size(struct spnic_hwdev *hwdev, u16 func_idx, u32 page_size)\n {\n \tstruct spnic_cmd_wq_page_size page_size_info;\n \tu16 out_size = sizeof(page_size_info);\n@@ -192,10 +190,10 @@ int spnic_set_wq_page_size(void *hwdev, u16 func_idx, u32 page_size)\n \treturn 0;\n }\n \n-int spnic_func_reset(void *hwdev, u64 reset_flag)\n+int spnic_func_reset(struct spnic_hwdev *hwdev, u64 reset_flag)\n {\n \tstruct spnic_reset func_reset;\n-\tstruct spnic_hwif *hwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\tstruct spnic_hwif *hwif = hwdev->hwif;\n \tu16 out_size = sizeof(func_reset);\n \tint err = 0;\n \n@@ -264,7 +262,7 @@ static u16 get_hw_rx_buf_size(u32 rx_buf_sz)\n \treturn DEFAULT_RX_BUF_SIZE; /* Default 2K */\n }\n \n-int spnic_set_root_ctxt(void *hwdev, u32 rq_depth, u32 sq_depth, u16 rx_buf_sz)\n+int spnic_set_root_ctxt(struct spnic_hwdev *hwdev, u32 rq_depth, u32 sq_depth, u16 rx_buf_sz)\n {\n \tstruct spnic_cmd_root_ctxt root_ctxt;\n \tu16 out_size = sizeof(root_ctxt);\n@@ -294,7 +292,7 @@ int spnic_set_root_ctxt(void *hwdev, u32 rq_depth, u32 sq_depth, u16 rx_buf_sz)\n \treturn 0;\n }\n \n-int spnic_clean_root_ctxt(void *hwdev)\n+int spnic_clean_root_ctxt(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_cmd_root_ctxt root_ctxt;\n \tu16 out_size = sizeof(root_ctxt);\n@@ -318,7 +316,7 @@ int spnic_clean_root_ctxt(void *hwdev)\n \treturn 0;\n }\n \n-int spnic_set_cmdq_depth(void *hwdev, u16 cmdq_depth)\n+int spnic_set_cmdq_depth(struct spnic_hwdev *hwdev, u16 cmdq_depth)\n {\n \tstruct spnic_cmd_root_ctxt root_ctxt;\n \tu16 out_size = sizeof(root_ctxt);\n@@ -388,7 +386,7 @@ int spnic_set_dma_attr_tbl(struct spnic_hwdev *hwdev, u32 entry_idx, u8 st,\n \treturn 0;\n }\n \n-int spnic_get_mgmt_version(void *hwdev, char *mgmt_ver, int max_mgmt_len)\n+int spnic_get_mgmt_version(struct spnic_hwdev *hwdev, char *mgmt_ver, int max_mgmt_len)\n {\n \tstruct spnic_cmd_get_fw_version fw_ver;\n \tu16 out_size = sizeof(fw_ver);\n@@ -415,7 +413,7 @@ int spnic_get_mgmt_version(void *hwdev, char *mgmt_ver, int max_mgmt_len)\n \treturn 0;\n }\n \n-int spnic_get_board_info(void *hwdev, struct spnic_board_info *info)\n+int spnic_get_board_info(struct spnic_hwdev *hwdev, struct spnic_board_info *info)\n {\n \tstruct spnic_cmd_board_info board_info;\n \tu16 out_size = sizeof(board_info);\n@@ -440,7 +438,7 @@ int spnic_get_board_info(void *hwdev, struct spnic_board_info *info)\n \treturn 0;\n }\n \n-static int spnic_comm_features_nego(void *hwdev, u8 opcode, u64 *s_feature,\n+static int spnic_comm_features_nego(struct spnic_hwdev *hwdev, u8 opcode, u64 *s_feature,\n \t\t\t\t     u16 size)\n {\n \tstruct comm_cmd_feature_nego feature_nego;\n@@ -472,13 +470,13 @@ static int spnic_comm_features_nego(void *hwdev, u8 opcode, u64 *s_feature,\n \treturn 0;\n }\n \n-int spnic_get_comm_features(void *hwdev, u64 *s_feature, u16 size)\n+int spnic_get_comm_features(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size)\n {\n \treturn spnic_comm_features_nego(hwdev, MGMT_MSG_CMD_OP_GET, s_feature,\n \t\t\t\t\t size);\n }\n \n-int spnic_set_comm_features(void *hwdev, u64 *s_feature, u16 size)\n+int spnic_set_comm_features(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size)\n {\n \treturn spnic_comm_features_nego(hwdev, MGMT_MSG_CMD_OP_SET, s_feature,\n \t\t\t\t\t size);\ndiff --git a/drivers/net/spnic/base/spnic_hw_comm.h b/drivers/net/spnic/base/spnic_hw_comm.h\nindex 4573595a89..5ceb838022 100644\n--- a/drivers/net/spnic/base/spnic_hw_comm.h\n+++ b/drivers/net/spnic/base/spnic_hw_comm.h\n@@ -174,29 +174,29 @@ struct interrupt_info {\n \tu8 resend_timer_cfg;\n };\n \n-int spnic_func_reset(void *hwdev, u64 reset_flag);\n+int spnic_func_reset(struct spnic_hwdev *hwdev, u64 reset_flag);\n \n-int spnic_get_mgmt_version(void *hwdev, char *mgmt_ver, int max_mgmt_len);\n+int spnic_get_mgmt_version(struct spnic_hwdev *hwdev, char *mgmt_ver, int max_mgmt_len);\n \n-int spnic_get_board_info(void *hwdev, struct spnic_board_info *info);\n+int spnic_get_board_info(struct spnic_hwdev *hwdev, struct spnic_board_info *info);\n \n-int spnic_set_root_ctxt(void *hwdev, u32 rq_depth, u32 sq_depth, u16 rx_buf_sz);\n+int spnic_set_root_ctxt(struct spnic_hwdev *hwdev, u32 rq_depth, u32 sq_depth, u16 rx_buf_sz);\n \n-int spnic_clean_root_ctxt(void *hwdev);\n+int spnic_clean_root_ctxt(struct spnic_hwdev *hwdev);\n \n-int spnic_get_interrupt_cfg(void *dev, struct interrupt_info *info);\n+int spnic_get_interrupt_cfg(struct spnic_hwdev *hwdev, struct interrupt_info *info);\n \n-int spnic_set_interrupt_cfg(void *dev, struct interrupt_info info);\n+int spnic_set_interrupt_cfg(struct spnic_hwdev *hwdev, struct interrupt_info info);\n \n-int spnic_set_wq_page_size(void *hwdev, u16 func_idx, u32 page_size);\n+int spnic_set_wq_page_size(struct spnic_hwdev *hwdev, u16 func_idx, u32 page_size);\n \n-int spnic_set_cmdq_depth(void *hwdev, u16 cmdq_depth);\n+int spnic_set_cmdq_depth(struct spnic_hwdev *hwdev, u16 cmdq_depth);\n \n int spnic_convert_rx_buf_size(u32 rx_buf_sz, u32 *match_sz);\n \n-int spnic_get_comm_features(void *hwdev, u64 *s_feature, u16 size);\n+int spnic_get_comm_features(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size);\n \n-int spnic_set_comm_features(void *hwdev, u64 *s_feature, u16 size);\n+int spnic_set_comm_features(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size);\n \n int spnic_set_dma_attr_tbl(struct spnic_hwdev *hwdev, u32 entry_idx, u8 st,\n \t\t\t   u8 at, u8 ph, u8 no_snooping, u8 tph_en);\ndiff --git a/drivers/net/spnic/base/spnic_hwdev.c b/drivers/net/spnic/base/spnic_hwdev.c\nindex 9dc4fdc2d6..2dd434b0b5 100644\n--- a/drivers/net/spnic/base/spnic_hwdev.c\n+++ b/drivers/net/spnic/base/spnic_hwdev.c\n@@ -4,7 +4,6 @@\n \n #include \"spnic_compat.h\"\n #include \"spnic_csr.h\"\n-#include \"spnic_hwif.h\"\n #include \"spnic_eqs.h\"\n #include \"spnic_mgmt.h\"\n #include \"spnic_cmd.h\"\n@@ -13,6 +12,7 @@\n #include \"spnic_cmdq.h\"\n #include \"spnic_hw_cfg.h\"\n #include \"spnic_hwdev.h\"\n+#include \"spnic_hwif.h\"\n #include \"spnic_hw_comm.h\"\n \n enum spnic_pcie_nosnoop {\n@@ -70,7 +70,7 @@ enum spnic_pcie_tph {\n #define SPNIC_DEAULT_EQ_MSIX_COALESC_TIMER_CFG\t0xFF\n #define SPNIC_DEAULT_EQ_MSIX_RESEND_TIMER_CFG\t7\n \n-typedef void (*mgmt_event_cb)(void *handle, void *buf_in, u16 in_size,\n+typedef void (*mgmt_event_cb)(struct spnic_hwdev *hwdev, void *buf_in, u16 in_size,\n \t\t\t      void *buf_out, u16 *out_size);\n \n struct mgmt_event_handle {\n@@ -93,7 +93,7 @@ int spnic_vf_handle_pf_comm_mbox(void *handle, __rte_unused void *pri_handle,\n \treturn 0;\n }\n \n-static void fault_event_handler(__rte_unused void *hwdev,\n+static void fault_event_handler(__rte_unused struct spnic_hwdev *hwdev,\n \t\t\t\t__rte_unused void *buf_in,\n \t\t\t\t__rte_unused u16 in_size,\n \t\t\t\t__rte_unused void *buf_out,\n@@ -102,7 +102,7 @@ static void fault_event_handler(__rte_unused void *hwdev,\n \tPMD_DRV_LOG(WARNING, \"Unsupported fault event handler\");\n }\n \n-static void ffm_event_msg_handler(__rte_unused void *hwdev,\n+static void ffm_event_msg_handler(__rte_unused struct spnic_hwdev *hwdev,\n \t\t\t\t  void *buf_in, u16 in_size,\n \t\t\t\t  __rte_unused void *buf_out, u16 *out_size)\n {\ndiff --git a/drivers/net/spnic/base/spnic_hwif.c b/drivers/net/spnic/base/spnic_hwif.c\nindex d61061ccfa..bcf0094c6b 100644\n--- a/drivers/net/spnic/base/spnic_hwif.c\n+++ b/drivers/net/spnic/base/spnic_hwif.c\n@@ -457,7 +457,7 @@ static void free_db_idx(struct spnic_hwif *hwif, u32 idx)\n \trte_spinlock_unlock(&free_db_area->idx_lock);\n }\n \n-void spnic_free_db_addr(void *hwdev, const void *db_base,\n+void spnic_free_db_addr(struct spnic_hwdev *hwdev, const void *db_base,\n \t\t\t __rte_unused void *dwqe_base)\n {\n \tstruct spnic_hwif *hwif = NULL;\n@@ -466,13 +466,13 @@ void spnic_free_db_addr(void *hwdev, const void *db_base,\n \tif (!hwdev || !db_base)\n \t\treturn;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \tidx = DB_IDX(db_base, hwif->db_base);\n \n \tfree_db_idx(hwif, idx);\n }\n \n-int spnic_alloc_db_addr(void *hwdev, void **db_base, void **dwqe_base)\n+int spnic_alloc_db_addr(struct spnic_hwdev *hwdev, void **db_base, void **dwqe_base)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \tu32 idx;\n@@ -481,7 +481,7 @@ int spnic_alloc_db_addr(void *hwdev, void **db_base, void **dwqe_base)\n \tif (!hwdev || !db_base)\n \t\treturn -EINVAL;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \terr = get_db_idx(hwif, &idx);\n \tif (err)\n@@ -501,13 +501,13 @@ int spnic_alloc_db_addr(void *hwdev, void **db_base, void **dwqe_base)\n  * Set msix state\n  *\n  * @param[in] hwdev\n- *   The pointer to the private hardware device object\n+ *   The device pointer to hwdev\n  * @param[in] msix_idx\n  *   MSIX index\n  * @param[in] flag\n  *   MSIX state flag, 0-enable, 1-disable\n  */\n-void spnic_set_msix_state(void *hwdev, u16 msix_idx, enum spnic_msix_state flag)\n+void spnic_set_msix_state(struct spnic_hwdev *hwdev, u16 msix_idx, enum spnic_msix_state flag)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \tu32 mask_bits;\n@@ -517,7 +517,7 @@ void spnic_set_msix_state(void *hwdev, u16 msix_idx, enum spnic_msix_state flag)\n \tif (!hwdev)\n \t\treturn;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \tif (flag)\n \t\tmask_bits = SPNIC_MSI_CLR_INDIR_SET(int_msk, INT_MSK_SET);\n@@ -539,7 +539,7 @@ static void disable_all_msix(struct spnic_hwdev *hwdev)\n \t\tspnic_set_msix_state(hwdev, i, SPNIC_MSIX_DISABLE);\n }\n \n-void spnic_misx_intr_clear_resend_bit(void *hwdev, u16 msix_idx,\n+void spnic_misx_intr_clear_resend_bit(struct spnic_hwdev *hwdev, u16 msix_idx,\n \t\t\t\t\t      u8 clear_resend_en)\n {\n \tstruct spnic_hwif *hwif = NULL;\n@@ -548,7 +548,7 @@ void spnic_misx_intr_clear_resend_bit(void *hwdev, u16 msix_idx,\n \tif (!hwdev)\n \t\treturn;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \tmsix_ctrl = SPNIC_MSI_CLR_INDIR_SET(msix_idx, SIMPLE_INDIR_IDX) |\n \t\t    SPNIC_MSI_CLR_INDIR_SET(clear_resend_en, RESEND_TIMER_CLR);\n@@ -636,14 +636,13 @@ static void spnic_get_bar_addr(struct spnic_hwdev *hwdev)\n  * Initialize the hw interface\n  *\n  * @param[in] hwdev\n- *   The pointer to the private hardware device object\n+ *   The device pointer to hwdev\n  *\n  * @retval zero : Success\n  * @retval non-zero : Failure.\n  */\n-int spnic_init_hwif(void *dev)\n+int spnic_init_hwif(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *hwdev = NULL;\n \tstruct spnic_hwif *hwif;\n \tint err;\n \n@@ -652,7 +651,6 @@ int spnic_init_hwif(void *dev)\n \tif (!hwif)\n \t\treturn -ENOMEM;\n \n-\thwdev = (struct spnic_hwdev *)dev;\n \thwdev->hwif = hwif;\n \n \tspnic_get_bar_addr(hwdev);\n@@ -703,72 +701,70 @@ int spnic_init_hwif(void *dev)\n /**\n  * Free the hw interface\n  *\n- * @param[in] dev\n- *   The pointer to the private hardware device object\n+ * @param[in] hwdev\n+ *   The device pointer to hwdev\n  */\n-void spnic_free_hwif(void *dev)\n+void spnic_free_hwif(struct spnic_hwdev *hwdev)\n {\n-\tstruct spnic_hwdev *hwdev = (struct spnic_hwdev *)dev;\n-\n \trte_free(hwdev->hwif);\n }\n \n-u16 spnic_global_func_id(void *hwdev)\n+u16 spnic_global_func_id(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \n \tif (!hwdev)\n \t\treturn 0;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \treturn hwif->attr.func_global_idx;\n }\n \n-u8 spnic_pf_id_of_vf(void *hwdev)\n+u8 spnic_pf_id_of_vf(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \n \tif (!hwdev)\n \t\treturn 0;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \treturn hwif->attr.port_to_port_idx;\n }\n \n-u8 spnic_pcie_itf_id(void *hwdev)\n+u8 spnic_pcie_itf_id(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \n \tif (!hwdev)\n \t\treturn 0;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \treturn hwif->attr.pci_intf_idx;\n }\n \n-enum func_type spnic_func_type(void *hwdev)\n+enum func_type spnic_func_type(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \n \tif (!hwdev)\n \t\treturn 0;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \treturn hwif->attr.func_type;\n }\n \n-u16 spnic_glb_pf_vf_offset(void *hwdev)\n+u16 spnic_glb_pf_vf_offset(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_hwif *hwif = NULL;\n \n \tif (!hwdev)\n \t\treturn 0;\n \n-\thwif = ((struct spnic_hwdev *)hwdev)->hwif;\n+\thwif = hwdev->hwif;\n \n \treturn hwif->attr.global_vf_id_of_pf;\n }\ndiff --git a/drivers/net/spnic/base/spnic_hwif.h b/drivers/net/spnic/base/spnic_hwif.h\nindex e2be026cba..07c50278cb 100644\n--- a/drivers/net/spnic/base/spnic_hwif.h\n+++ b/drivers/net/spnic/base/spnic_hwif.h\n@@ -118,38 +118,38 @@ u32 spnic_hwif_read_reg(struct spnic_hwif *hwif, u32 reg);\n \n void spnic_hwif_write_reg(struct spnic_hwif *hwif, u32 reg, u32 val);\n \n-void spnic_set_msix_state(void *hwdev, u16 msix_idx,\n+void spnic_set_msix_state(struct spnic_hwdev *hwdev, u16 msix_idx,\n \t\t\t  enum spnic_msix_state flag);\n \n-void spnic_misx_intr_clear_resend_bit(void *hwdev, u16 msix_idx,\n+void spnic_misx_intr_clear_resend_bit(struct spnic_hwdev *hwdev, u16 msix_idx,\n \t\t\t\t       u8 clear_resend_en);\n \n-u16 spnic_global_func_id(void *hwdev);\n+u16 spnic_global_func_id(struct spnic_hwdev *hwdev);\n \n-u8 spnic_pf_id_of_vf(void *hwdev);\n+u8 spnic_pf_id_of_vf(struct spnic_hwdev *hwdev);\n \n-u8 spnic_pcie_itf_id(void *hwdev);\n+u8 spnic_pcie_itf_id(struct spnic_hwdev *hwdev);\n \n-enum func_type spnic_func_type(void *hwdev);\n+enum func_type spnic_func_type(struct spnic_hwdev *hwdev);\n \n-u16 spnic_glb_pf_vf_offset(void *hwdev);\n+u16 spnic_glb_pf_vf_offset(struct spnic_hwdev *hwdev);\n \n void spnic_set_pf_status(struct spnic_hwif *hwif,\n \t\t\t enum spnic_pf_status status);\n \n enum spnic_pf_status spnic_get_pf_status(struct spnic_hwif *hwif);\n \n-int spnic_alloc_db_addr(void *hwdev, void **db_base, void **dwqe_base);\n+int spnic_alloc_db_addr(struct spnic_hwdev *hwdev, void **db_base, void **dwqe_base);\n \n-void spnic_free_db_addr(void *hwdev, const void *db_base,\n+void spnic_free_db_addr(struct spnic_hwdev *hwdev, const void *db_base,\n \t\t\t__rte_unused void *dwqe_base);\n \n void spnic_disable_doorbell(struct spnic_hwif *hwif);\n \n void spnic_enable_doorbell(struct spnic_hwif *hwif);\n \n-int spnic_init_hwif(void *dev);\n+int spnic_init_hwif(struct spnic_hwdev *hwdev);\n \n-void spnic_free_hwif(void *dev);\n+void spnic_free_hwif(struct spnic_hwdev *hwdev);\n \n #endif /* _SPNIC_HWIF_H_ */\ndiff --git a/drivers/net/spnic/base/spnic_mgmt.c b/drivers/net/spnic/base/spnic_mgmt.c\nindex 98f58867e7..08ae1a2feb 100644\n--- a/drivers/net/spnic/base/spnic_mgmt.c\n+++ b/drivers/net/spnic/base/spnic_mgmt.c\n@@ -35,7 +35,7 @@\n \n #define MGMT_MSG_TIMEOUT\t\t\t300000 /* Millisecond */\n \n-int spnic_msg_to_mgmt_sync(void *hwdev, enum spnic_mod_type mod, u16 cmd,\n+int spnic_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u16 cmd,\n \t\t\t   void *buf_in, u16 in_size, void *buf_out,\n \t\t\t   u16 *out_size, u32 timeout)\n {\n@@ -186,7 +186,7 @@ static int recv_mgmt_msg_handler(struct spnic_msg_pf_to_mgmt *pf_to_mgmt,\n  * Handler for a mgmt message event\n  *\n  * @param[in] hwdev\n- *   The pointer to the private hardware device object\n+ *   The device pointer to hwdev\n  * @param[in] header\n  *   The header of the message\n  * @param[in] size\n@@ -197,9 +197,8 @@ static int recv_mgmt_msg_handler(struct spnic_msg_pf_to_mgmt *pf_to_mgmt,\n  * @retval zero : When aeqe is response message\n  * @retval negative : When wrong message or not last message.\n  */\n-int spnic_mgmt_msg_aeqe_handler(void *hwdev, u8 *header, u8 size, void *param)\n+int spnic_mgmt_msg_aeqe_handler(struct spnic_hwdev *hwdev, u8 *header, u8 size, void *param)\n {\n-\tstruct spnic_hwdev *dev = (struct spnic_hwdev *)hwdev;\n \tstruct spnic_msg_pf_to_mgmt *pf_to_mgmt = NULL;\n \tstruct spnic_recv_msg *recv_msg = NULL;\n \tbool is_send_dir = false;\n@@ -209,7 +208,7 @@ int spnic_mgmt_msg_aeqe_handler(void *hwdev, u8 *header, u8 size, void *param)\n \t\treturn spnic_mbox_func_aeqe_handler(hwdev, header, size, param);\n \t}\n \n-\tpf_to_mgmt = dev->pf_to_mgmt;\n+\tpf_to_mgmt = hwdev->pf_to_mgmt;\n \n \tis_send_dir = (SPNIC_MSG_HEADER_GET(*(u64 *)header, DIRECTION) ==\n \t\t       SPNIC_MSG_DIRECT_SEND) ? true : false;\ndiff --git a/drivers/net/spnic/base/spnic_mgmt.h b/drivers/net/spnic/base/spnic_mgmt.h\nindex 7325fc4d03..8250a32267 100644\n--- a/drivers/net/spnic/base/spnic_mgmt.h\n+++ b/drivers/net/spnic/base/spnic_mgmt.h\n@@ -97,13 +97,13 @@ struct spnic_msg_pf_to_mgmt {\n \tu16 sync_msg_id;\n };\n \n-int spnic_mgmt_msg_aeqe_handler(void *hwdev, u8 *header, u8 size, void *param);\n+int spnic_mgmt_msg_aeqe_handler(struct spnic_hwdev *hwdev, u8 *header, u8 size, void *param);\n \n int spnic_pf_to_mgmt_init(struct spnic_hwdev *hwdev);\n \n void spnic_pf_to_mgmt_free(struct spnic_hwdev *hwdev);\n \n-int spnic_msg_to_mgmt_sync(void *hwdev, enum spnic_mod_type mod, u16 cmd,\n+int spnic_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, enum spnic_mod_type mod, u16 cmd,\n \t\t\t   void *buf_in, u16 in_size, void *buf_out,\n \t\t\t   u16 *out_size, u32 timeout);\n \ndiff --git a/drivers/net/spnic/base/spnic_nic_cfg.c b/drivers/net/spnic/base/spnic_nic_cfg.c\nindex 78561a5c64..0d6200580c 100644\n--- a/drivers/net/spnic/base/spnic_nic_cfg.c\n+++ b/drivers/net/spnic/base/spnic_nic_cfg.c\n@@ -50,10 +50,10 @@ static const struct vf_msg_handler vf_mag_cmd_handler[] = {\n \t},\n };\n \n-static int mag_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n+static int mag_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in, u16 in_size,\n \t\t\t\tvoid *buf_out, u16 *out_size);\n \n-int spnic_l2nic_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n+int spnic_l2nic_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in, u16 in_size,\n \t\t\t   void *buf_out, u16 *out_size)\n {\n \tu32 i, cmd_cnt = ARRAY_LEN(vf_cmd_handler);\n@@ -75,7 +75,7 @@ int spnic_l2nic_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in, u16 in_size\n \t\t\t\t      in_size, buf_out, out_size, 0);\n }\n \n-int spnic_set_ci_table(void *hwdev, struct spnic_sq_attr *attr)\n+int spnic_set_ci_table(struct spnic_hwdev *hwdev, struct spnic_sq_attr *attr)\n {\n \tstruct spnic_cmd_cons_idx_attr cons_idx_attr;\n \tu16 out_size = sizeof(cons_idx_attr);\n@@ -124,7 +124,7 @@ static int spnic_check_mac_info(u8 status, u16 vlan_id)\n \n #define VLAN_N_VID\t\t4096\n \n-int spnic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n+int spnic_set_mac(struct spnic_hwdev *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n {\n \tstruct spnic_port_mac_set mac_info;\n \tu16 out_size = sizeof(mac_info);\n@@ -166,7 +166,7 @@ int spnic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n \treturn 0;\n }\n \n-int spnic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n+int spnic_del_mac(struct spnic_hwdev *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n {\n \tstruct spnic_port_mac_set mac_info;\n \tu16 out_size = sizeof(mac_info);\n@@ -202,7 +202,7 @@ int spnic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id)\n \treturn 0;\n }\n \n-int spnic_update_mac(void *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n+int spnic_update_mac(struct spnic_hwdev *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n \t\t     u16 func_id)\n {\n \tstruct spnic_port_mac_update mac_info;\n@@ -245,7 +245,7 @@ int spnic_update_mac(void *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n \treturn 0;\n }\n \n-int spnic_get_default_mac(void *hwdev, u8 *mac_addr, int ether_len)\n+int spnic_get_default_mac(struct spnic_hwdev *hwdev, u8 *mac_addr, int ether_len)\n {\n \tstruct spnic_port_mac_set mac_info;\n \tu16 out_size = sizeof(mac_info);\n@@ -271,7 +271,7 @@ int spnic_get_default_mac(void *hwdev, u8 *mac_addr, int ether_len)\n \treturn 0;\n }\n \n-static int spnic_config_vlan(void *hwdev, u8 opcode, u16 vlan_id, u16 func_id)\n+static int spnic_config_vlan(struct spnic_hwdev *hwdev, u8 opcode, u16 vlan_id, u16 func_id)\n {\n \tstruct spnic_cmd_vlan_config vlan_info;\n \tu16 out_size = sizeof(vlan_info);\n@@ -294,7 +294,7 @@ static int spnic_config_vlan(void *hwdev, u8 opcode, u16 vlan_id, u16 func_id)\n \treturn 0;\n }\n \n-int spnic_add_vlan(void *hwdev, u16 vlan_id, u16 func_id)\n+int spnic_add_vlan(struct spnic_hwdev *hwdev, u16 vlan_id, u16 func_id)\n {\n \tif (!hwdev)\n \t\treturn -EINVAL;\n@@ -302,7 +302,7 @@ int spnic_add_vlan(void *hwdev, u16 vlan_id, u16 func_id)\n \treturn spnic_config_vlan(hwdev, SPNIC_CMD_OP_ADD, vlan_id, func_id);\n }\n \n-int spnic_del_vlan(void *hwdev, u16 vlan_id, u16 func_id)\n+int spnic_del_vlan(struct spnic_hwdev *hwdev, u16 vlan_id, u16 func_id)\n {\n \tif (!hwdev)\n \t\treturn -EINVAL;\n@@ -310,7 +310,7 @@ int spnic_del_vlan(void *hwdev, u16 vlan_id, u16 func_id)\n \treturn spnic_config_vlan(hwdev, SPNIC_CMD_OP_DEL, vlan_id, func_id);\n }\n \n-int spnic_get_port_info(void *hwdev, struct nic_port_info *port_info)\n+int spnic_get_port_info(struct spnic_hwdev *hwdev, struct nic_port_info *port_info)\n {\n \tstruct spnic_cmd_port_info port_msg;\n \tu16 out_size = sizeof(port_msg);\n@@ -341,7 +341,7 @@ int spnic_get_port_info(void *hwdev, struct nic_port_info *port_info)\n }\n \n \n-int spnic_get_link_state(void *hwdev, u8 *link_state)\n+int spnic_get_link_state(struct spnic_hwdev *hwdev, u8 *link_state)\n {\n \tstruct spnic_cmd_link_state get_link;\n \tu16 out_size = sizeof(get_link);\n@@ -365,7 +365,7 @@ int spnic_get_link_state(void *hwdev, u8 *link_state)\n \treturn 0;\n }\n \n-int spnic_set_vport_enable(void *hwdev, bool enable)\n+int spnic_set_vport_enable(struct spnic_hwdev *hwdev, bool enable)\n {\n \tstruct spnic_vport_state en_state;\n \tu16 out_size = sizeof(en_state);\n@@ -389,7 +389,7 @@ int spnic_set_vport_enable(void *hwdev, bool enable)\n \treturn 0;\n }\n \n-int spnic_set_port_enable(void *hwdev, bool enable)\n+int spnic_set_port_enable(struct spnic_hwdev *hwdev, bool enable)\n {\n \tstruct mag_cmd_set_port_enable en_state;\n \tu16 out_size = sizeof(en_state);\n@@ -417,7 +417,7 @@ int spnic_set_port_enable(void *hwdev, bool enable)\n \treturn 0;\n }\n \n-int spnic_flush_qps_res(void *hwdev)\n+int spnic_flush_qps_res(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_cmd_clear_qp_resource sq_res;\n \tu16 out_size = sizeof(sq_res);\n@@ -440,7 +440,7 @@ int spnic_flush_qps_res(void *hwdev)\n \treturn 0;\n }\n \n-static int spnic_cfg_hw_pause(void *hwdev, u8 opcode,\n+static int spnic_cfg_hw_pause(struct spnic_hwdev *hwdev, u8 opcode,\n \t\t\t       struct nic_pause_config *nic_pause)\n {\n \tstruct spnic_cmd_pause_config pause_info;\n@@ -476,7 +476,7 @@ static int spnic_cfg_hw_pause(void *hwdev, u8 opcode,\n \treturn 0;\n }\n \n-int spnic_set_pause_info(void *hwdev, struct nic_pause_config nic_pause)\n+int spnic_set_pause_info(struct spnic_hwdev *hwdev, struct nic_pause_config nic_pause)\n {\n \tif (!hwdev)\n \t\treturn -EINVAL;\n@@ -484,7 +484,7 @@ int spnic_set_pause_info(void *hwdev, struct nic_pause_config nic_pause)\n \treturn spnic_cfg_hw_pause(hwdev, SPNIC_CMD_OP_SET, &nic_pause);\n }\n \n-int spnic_get_pause_info(void *hwdev, struct nic_pause_config *nic_pause)\n+int spnic_get_pause_info(struct spnic_hwdev *hwdev, struct nic_pause_config *nic_pause)\n {\n \tif (!hwdev || !nic_pause)\n \t\treturn -EINVAL;\n@@ -493,7 +493,7 @@ int spnic_get_pause_info(void *hwdev, struct nic_pause_config *nic_pause)\n \treturn spnic_cfg_hw_pause(hwdev, SPNIC_CMD_OP_GET, nic_pause);\n }\n \n-int spnic_get_vport_stats(void *hwdev, struct spnic_vport_stats *stats)\n+int spnic_get_vport_stats(struct spnic_hwdev *hwdev, struct spnic_vport_stats *stats)\n {\n \tstruct spnic_port_stats_info stats_info;\n \tstruct spnic_cmd_vport_stats vport_stats;\n@@ -522,7 +522,7 @@ int spnic_get_vport_stats(void *hwdev, struct spnic_vport_stats *stats)\n \treturn 0;\n }\n \n-int spnic_get_phy_port_stats(void *hwdev, struct mag_phy_port_stats *stats)\n+int spnic_get_phy_port_stats(struct spnic_hwdev *hwdev, struct mag_phy_port_stats *stats)\n {\n \tstruct mag_cmd_get_port_stat *port_stats = NULL;\n \tstruct mag_cmd_port_stats_info stats_info;\n@@ -555,7 +555,7 @@ int spnic_get_phy_port_stats(void *hwdev, struct mag_phy_port_stats *stats)\n \treturn err;\n }\n \n-int spnic_clear_vport_stats(void *hwdev)\n+int spnic_clear_vport_stats(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_cmd_clear_vport_stats clear_vport_stats;\n \tu16 out_size = sizeof(clear_vport_stats);\n@@ -582,7 +582,7 @@ int spnic_clear_vport_stats(void *hwdev)\n \treturn 0;\n }\n \n-int spnic_clear_phy_port_stats(void *hwdev)\n+int spnic_clear_phy_port_stats(struct spnic_hwdev *hwdev)\n {\n \tstruct mag_cmd_clr_port_stat *port_stats = NULL;\n \tu16 out_size = sizeof(*port_stats);\n@@ -611,7 +611,7 @@ int spnic_clear_phy_port_stats(void *hwdev)\n \treturn err;\n }\n \n-static int spnic_set_function_table(void *hwdev, u32 cfg_bitmap,\n+static int spnic_set_function_table(struct spnic_hwdev *hwdev, u32 cfg_bitmap,\n \t\t\t\t     struct spnic_func_tbl_cfg *cfg)\n {\n \tstruct spnic_cmd_set_func_tbl cmd_func_tbl;\n@@ -636,7 +636,7 @@ static int spnic_set_function_table(void *hwdev, u32 cfg_bitmap,\n \treturn 0;\n }\n \n-int spnic_init_function_table(void *hwdev, u16 rx_buff_len)\n+int spnic_init_function_table(struct spnic_hwdev *hwdev, u16 rx_buff_len)\n {\n \tstruct spnic_func_tbl_cfg func_tbl_cfg;\n \tu32 cfg_bitmap = BIT(FUNC_CFG_INIT) | BIT(FUNC_CFG_MTU) |\n@@ -649,7 +649,7 @@ int spnic_init_function_table(void *hwdev, u16 rx_buff_len)\n \treturn spnic_set_function_table(hwdev, cfg_bitmap, &func_tbl_cfg);\n }\n \n-int spnic_set_port_mtu(void *hwdev, u16 new_mtu)\n+int spnic_set_port_mtu(struct spnic_hwdev *hwdev, u16 new_mtu)\n {\n \tstruct spnic_func_tbl_cfg func_tbl_cfg;\n \n@@ -675,7 +675,7 @@ int spnic_set_port_mtu(void *hwdev, u16 new_mtu)\n \t\t\t\t\t&func_tbl_cfg);\n }\n \n-static int nic_feature_nego(void *hwdev, u8 opcode, u64 *s_feature, u16 size)\n+static int nic_feature_nego(struct spnic_hwdev *hwdev, u8 opcode, u64 *s_feature, u16 size)\n {\n \tstruct spnic_cmd_feature_nego feature_nego;\n \tu16 out_size = sizeof(feature_nego);\n@@ -705,17 +705,17 @@ static int nic_feature_nego(void *hwdev, u8 opcode, u64 *s_feature, u16 size)\n \treturn 0;\n }\n \n-int spnic_get_feature_from_hw(void *hwdev, u64 *s_feature, u16 size)\n+int spnic_get_feature_from_hw(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size)\n {\n \treturn nic_feature_nego(hwdev, SPNIC_CMD_OP_GET, s_feature, size);\n }\n \n-int spnic_set_feature_to_hw(void *hwdev, u64 *s_feature, u16 size)\n+int spnic_set_feature_to_hw(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size)\n {\n \treturn nic_feature_nego(hwdev, SPNIC_CMD_OP_SET, s_feature, size);\n }\n \n-static int spnic_vf_func_init(void *hwdev)\n+static int spnic_vf_func_init(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_cmd_register_vf register_info;\n \tu16 out_size = sizeof(register_info);\n@@ -738,7 +738,7 @@ static int spnic_vf_func_init(void *hwdev)\n \treturn 0;\n }\n \n-static int spnic_vf_func_free(void *hwdev)\n+static int spnic_vf_func_free(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_cmd_register_vf unregister;\n \tu16 out_size = sizeof(unregister);\n@@ -761,12 +761,12 @@ static int spnic_vf_func_free(void *hwdev)\n \treturn 0;\n }\n \n-int spnic_init_nic_hwdev(void *hwdev)\n+int spnic_init_nic_hwdev(struct spnic_hwdev *hwdev)\n {\n \treturn spnic_vf_func_init(hwdev);\n }\n \n-void spnic_free_nic_hwdev(void *hwdev)\n+void spnic_free_nic_hwdev(struct spnic_hwdev *hwdev)\n {\n \tif (!hwdev)\n \t\treturn;\n@@ -774,7 +774,7 @@ void spnic_free_nic_hwdev(void *hwdev)\n \tspnic_vf_func_free(hwdev);\n }\n \n-int spnic_set_rx_mode(void *hwdev, u32 enable)\n+int spnic_set_rx_mode(struct spnic_hwdev *hwdev, u32 enable)\n {\n \tstruct spnic_rx_mode_config rx_mode_cfg;\n \tu16 out_size = sizeof(rx_mode_cfg);\n@@ -799,7 +799,7 @@ int spnic_set_rx_mode(void *hwdev, u32 enable)\n \treturn 0;\n }\n \n-int spnic_set_rx_vlan_offload(void *hwdev, u8 en)\n+int spnic_set_rx_vlan_offload(struct spnic_hwdev *hwdev, u8 en)\n {\n \tstruct spnic_cmd_vlan_offload vlan_cfg;\n \tu16 out_size = sizeof(vlan_cfg);\n@@ -824,7 +824,7 @@ int spnic_set_rx_vlan_offload(void *hwdev, u8 en)\n \treturn 0;\n }\n \n-int spnic_set_vlan_fliter(void *hwdev, u32 vlan_filter_ctrl)\n+int spnic_set_vlan_fliter(struct spnic_hwdev *hwdev, u32 vlan_filter_ctrl)\n {\n \tstruct spnic_cmd_set_vlan_filter vlan_filter;\n \tu16 out_size = sizeof(vlan_filter);\n@@ -849,7 +849,7 @@ int spnic_set_vlan_fliter(void *hwdev, u32 vlan_filter_ctrl)\n \treturn 0;\n }\n \n-static int spnic_set_rx_lro(void *hwdev, u8 ipv4_en, u8 ipv6_en,\n+static int spnic_set_rx_lro(struct spnic_hwdev *hwdev, u8 ipv4_en, u8 ipv6_en,\n \t\t\t    u8 lro_max_pkt_len)\n {\n \tstruct spnic_cmd_lro_config lro_cfg;\n@@ -877,7 +877,7 @@ static int spnic_set_rx_lro(void *hwdev, u8 ipv4_en, u8 ipv6_en,\n \treturn 0;\n }\n \n-static int spnic_set_rx_lro_timer(void *hwdev, u32 timer_value)\n+static int spnic_set_rx_lro_timer(struct spnic_hwdev *hwdev, u32 timer_value)\n {\n \tstruct spnic_cmd_lro_timer lro_timer;\n \tu16 out_size = sizeof(lro_timer);\n@@ -902,7 +902,7 @@ static int spnic_set_rx_lro_timer(void *hwdev, u32 timer_value)\n \treturn 0;\n }\n \n-int spnic_set_rx_lro_state(void *hwdev, u8 lro_en, u32 lro_timer,\n+int spnic_set_rx_lro_state(struct spnic_hwdev *hwdev, u8 lro_en, u32 lro_timer,\n \t\t\t    u32 lro_max_pkt_len)\n {\n \tu8 ipv4_en = 0, ipv6_en = 0;\n@@ -931,7 +931,7 @@ int spnic_set_rx_lro_state(void *hwdev, u8 lro_en, u32 lro_timer,\n }\n \n /* RSS config */\n-int spnic_rss_template_alloc(void *hwdev)\n+int spnic_rss_template_alloc(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_rss_template_mgmt template_mgmt;\n \tu16 out_size = sizeof(template_mgmt);\n@@ -962,7 +962,7 @@ int spnic_rss_template_alloc(void *hwdev)\n \treturn 0;\n }\n \n-int spnic_rss_template_free(void *hwdev)\n+int spnic_rss_template_free(struct spnic_hwdev *hwdev)\n {\n \tstruct spnic_rss_template_mgmt template_mgmt;\n \tu16 out_size = sizeof(template_mgmt);\n@@ -988,7 +988,7 @@ int spnic_rss_template_free(void *hwdev)\n \treturn 0;\n }\n \n-static int spnic_rss_cfg_hash_key(void *hwdev, u8 opcode, u8 *key)\n+static int spnic_rss_cfg_hash_key(struct spnic_hwdev *hwdev, u8 opcode, u8 *key)\n {\n \tstruct spnic_cmd_rss_hash_key hash_key;\n \tu16 out_size = sizeof(hash_key);\n@@ -1020,7 +1020,7 @@ static int spnic_rss_cfg_hash_key(void *hwdev, u8 opcode, u8 *key)\n \treturn 0;\n }\n \n-int spnic_rss_set_hash_key(void *hwdev, u8 *key)\n+int spnic_rss_set_hash_key(struct spnic_hwdev *hwdev, u8 *key)\n {\n \tif (!hwdev || !key)\n \t\treturn -EINVAL;\n@@ -1028,7 +1028,7 @@ int spnic_rss_set_hash_key(void *hwdev, u8 *key)\n \treturn spnic_rss_cfg_hash_key(hwdev, SPNIC_CMD_OP_SET, key);\n }\n \n-int spnic_rss_get_hash_key(void *hwdev, u8 *key)\n+int spnic_rss_get_hash_key(struct spnic_hwdev *hwdev, u8 *key)\n {\n \tif (!hwdev || !key)\n \t\treturn -EINVAL;\n@@ -1036,7 +1036,7 @@ int spnic_rss_get_hash_key(void *hwdev, u8 *key)\n \treturn spnic_rss_cfg_hash_key(hwdev, SPNIC_CMD_OP_GET, key);\n }\n \n-int spnic_rss_get_indir_tbl(void *hwdev, u32 *indir_table)\n+int spnic_rss_get_indir_tbl(struct spnic_hwdev *hwdev, u32 *indir_table)\n {\n \tstruct spnic_cmd_buf *cmd_buf = NULL;\n \tu16 *indir_tbl = NULL;\n@@ -1069,7 +1069,7 @@ int spnic_rss_get_indir_tbl(void *hwdev, u32 *indir_table)\n \treturn 0;\n }\n \n-int spnic_rss_set_indir_tbl(void *hwdev, const u32 *indir_table)\n+int spnic_rss_set_indir_tbl(struct spnic_hwdev *hwdev, const u32 *indir_table)\n {\n \tstruct nic_rss_indirect_tbl *indir_tbl = NULL;\n \tstruct spnic_cmd_buf *cmd_buf = NULL;\n@@ -1111,7 +1111,7 @@ int spnic_rss_set_indir_tbl(void *hwdev, const u32 *indir_table)\n \treturn err;\n }\n \n-int spnic_set_rss_type(void *hwdev, struct spnic_rss_type rss_type)\n+int spnic_set_rss_type(struct spnic_hwdev *hwdev, struct spnic_rss_type rss_type)\n {\n \tstruct nic_rss_context_tbl *ctx_tbl = NULL;\n \tstruct spnic_cmd_buf *cmd_buf = NULL;\n@@ -1158,7 +1158,7 @@ int spnic_set_rss_type(void *hwdev, struct spnic_rss_type rss_type)\n \treturn 0;\n }\n \n-int spnic_get_rss_type(void *hwdev, struct spnic_rss_type *rss_type)\n+int spnic_get_rss_type(struct spnic_hwdev *hwdev, struct spnic_rss_type *rss_type)\n {\n \tstruct spnic_rss_context_table ctx_tbl;\n \tu16 out_size = sizeof(ctx_tbl);\n@@ -1192,7 +1192,7 @@ int spnic_get_rss_type(void *hwdev, struct spnic_rss_type *rss_type)\n \treturn 0;\n }\n \n-static int spnic_rss_cfg_hash_engine(void *hwdev, u8 opcode, u8 *type)\n+static int spnic_rss_cfg_hash_engine(struct spnic_hwdev *hwdev, u8 opcode, u8 *type)\n {\n \tstruct spnic_cmd_rss_engine_type hash_type;\n \tu16 out_size = sizeof(hash_type);\n@@ -1224,7 +1224,7 @@ static int spnic_rss_cfg_hash_engine(void *hwdev, u8 opcode, u8 *type)\n \treturn 0;\n }\n \n-int spnic_rss_get_hash_engine(void *hwdev, u8 *type)\n+int spnic_rss_get_hash_engine(struct spnic_hwdev *hwdev, u8 *type)\n {\n \tif (!hwdev || !type)\n \t\treturn -EINVAL;\n@@ -1232,7 +1232,7 @@ int spnic_rss_get_hash_engine(void *hwdev, u8 *type)\n \treturn spnic_rss_cfg_hash_engine(hwdev, SPNIC_CMD_OP_GET, type);\n }\n \n-int spnic_rss_set_hash_engine(void *hwdev, u8 type)\n+int spnic_rss_set_hash_engine(struct spnic_hwdev *hwdev, u8 type)\n {\n \tif (!hwdev)\n \t\treturn -EINVAL;\n@@ -1240,7 +1240,7 @@ int spnic_rss_set_hash_engine(void *hwdev, u8 type)\n \treturn spnic_rss_cfg_hash_engine(hwdev, SPNIC_CMD_OP_SET, &type);\n }\n \n-int spnic_rss_cfg(void *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc)\n+int spnic_rss_cfg(struct spnic_hwdev *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc)\n {\n \tstruct spnic_cmd_rss_config rss_cfg;\n \tu16 out_size = sizeof(rss_cfg);\n@@ -1268,7 +1268,7 @@ int spnic_rss_cfg(void *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc)\n \treturn 0;\n }\n \n-int spnic_vf_get_default_cos(void *hwdev, u8 *cos_id)\n+int spnic_vf_get_default_cos(struct spnic_hwdev *hwdev, u8 *cos_id)\n {\n \tstruct spnic_cmd_vf_dcb_state vf_dcb;\n \tu16 out_size = sizeof(vf_dcb);\n@@ -1289,7 +1289,7 @@ int spnic_vf_get_default_cos(void *hwdev, u8 *cos_id)\n \treturn 0;\n }\n \n-int spnic_set_rq_flush(void *hwdev, u16 q_id)\n+int spnic_set_rq_flush(struct spnic_hwdev *hwdev, u16 q_id)\n {\n \tstruct spnic_cmd_set_rq_flush *rq_flush_msg = NULL;\n \tstruct spnic_cmd_buf *cmd_buf = NULL;\n@@ -1322,7 +1322,7 @@ int spnic_set_rq_flush(void *hwdev, u16 q_id)\n \treturn err;\n }\n \n-static int _mag_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in,\n+static int _mag_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in,\n \t\t\t\t u16 in_size, void *buf_out, u16 *out_size)\n {\n \tu32 i, cmd_cnt = ARRAY_LEN(vf_mag_cmd_handler);\n@@ -1340,7 +1340,7 @@ static int _mag_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in,\n \t\t\t\t      in_size, buf_out, out_size, 0);\n }\n \n-static int mag_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n+static int mag_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in, u16 in_size,\n \t\t\t\tvoid *buf_out, u16 *out_size)\n {\n \treturn _mag_msg_to_mgmt_sync(hwdev, cmd, buf_in, in_size, buf_out,\ndiff --git a/drivers/net/spnic/base/spnic_nic_cfg.h b/drivers/net/spnic/base/spnic_nic_cfg.h\nindex c73191dc81..9f83808839 100644\n--- a/drivers/net/spnic/base/spnic_nic_cfg.h\n+++ b/drivers/net/spnic/base/spnic_nic_cfg.h\n@@ -577,10 +577,10 @@ struct spnic_cmd_set_rq_flush {\n \t};\n };\n \n-int spnic_l2nic_msg_to_mgmt_sync(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n+int spnic_l2nic_msg_to_mgmt_sync(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in, u16 in_size,\n \t\t\t   void *buf_out, u16 *out_size);\n \n-int spnic_set_ci_table(void *hwdev, struct spnic_sq_attr *attr);\n+int spnic_set_ci_table(struct spnic_hwdev *hwdev, struct spnic_sq_attr *attr);\n \n /**\n  * Update MAC address to hardware\n@@ -599,7 +599,7 @@ int spnic_set_ci_table(void *hwdev, struct spnic_sq_attr *attr);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_update_mac(void *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n+int spnic_update_mac(struct spnic_hwdev *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n \t\t     u16 func_id);\n \n /**\n@@ -615,7 +615,7 @@ int spnic_update_mac(void *hwdev, u8 *old_mac, u8 *new_mac, u16 vlan_id,\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_default_mac(void *hwdev, u8 *mac_addr, int ether_len);\n+int spnic_get_default_mac(struct spnic_hwdev *hwdev, u8 *mac_addr, int ether_len);\n \n /**\n  * Set mac address\n@@ -632,7 +632,7 @@ int spnic_get_default_mac(void *hwdev, u8 *mac_addr, int ether_len);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n+int spnic_set_mac(struct spnic_hwdev *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n \n /**\n  * Delete MAC address\n@@ -649,7 +649,7 @@ int spnic_set_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n+int spnic_del_mac(struct spnic_hwdev *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n \n /**\n  * Set function mtu\n@@ -662,7 +662,7 @@ int spnic_del_mac(void *hwdev, const u8 *mac_addr, u16 vlan_id, u16 func_id);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_port_mtu(void *hwdev, u16 new_mtu);\n+int spnic_set_port_mtu(struct spnic_hwdev *hwdev, u16 new_mtu);\n \n /**\n  * Set function valid status\n@@ -675,7 +675,7 @@ int spnic_set_port_mtu(void *hwdev, u16 new_mtu);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_vport_enable(void *hwdev, bool enable);\n+int spnic_set_vport_enable(struct spnic_hwdev *hwdev, bool enable);\n \n /**\n  * Set port status\n@@ -688,7 +688,7 @@ int spnic_set_vport_enable(void *hwdev, bool enable);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_port_enable(void *hwdev, bool enable);\n+int spnic_set_port_enable(struct spnic_hwdev *hwdev, bool enable);\n \n /**\n  * Get link state\n@@ -701,7 +701,7 @@ int spnic_set_port_enable(void *hwdev, bool enable);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_link_state(void *hwdev, u8 *link_state);\n+int spnic_get_link_state(struct spnic_hwdev *hwdev, u8 *link_state);\n \n /**\n  * Flush queue pairs resource in hardware\n@@ -712,7 +712,7 @@ int spnic_get_link_state(void *hwdev, u8 *link_state);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_flush_qps_res(void *hwdev);\n+int spnic_flush_qps_res(struct spnic_hwdev *hwdev);\n \n /**\n  * Set pause info\n@@ -725,7 +725,7 @@ int spnic_flush_qps_res(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_pause_info(void *hwdev, struct nic_pause_config nic_pause);\n+int spnic_set_pause_info(struct spnic_hwdev *hwdev, struct nic_pause_config nic_pause);\n \n /**\n  * Get pause info\n@@ -738,7 +738,7 @@ int spnic_set_pause_info(void *hwdev, struct nic_pause_config nic_pause);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_pause_info(void *hwdev, struct nic_pause_config *nic_pause);\n+int spnic_get_pause_info(struct spnic_hwdev *hwdev, struct nic_pause_config *nic_pause);\n \n /**\n  * Get function stats\n@@ -751,7 +751,7 @@ int spnic_get_pause_info(void *hwdev, struct nic_pause_config *nic_pause);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_vport_stats(void *hwdev, struct spnic_vport_stats *stats);\n+int spnic_get_vport_stats(struct spnic_hwdev *hwdev, struct spnic_vport_stats *stats);\n \n /**\n  * Get port stats\n@@ -764,7 +764,7 @@ int spnic_get_vport_stats(void *hwdev, struct spnic_vport_stats *stats);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_phy_port_stats(void *hwdev, struct mag_phy_port_stats *stats);\n+int spnic_get_phy_port_stats(struct spnic_hwdev *hwdev, struct mag_phy_port_stats *stats);\n \n /**\n  * Clear function stats\n@@ -777,7 +777,7 @@ int spnic_get_phy_port_stats(void *hwdev, struct mag_phy_port_stats *stats);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_clear_vport_stats(void *hwdev);\n+int spnic_clear_vport_stats(struct spnic_hwdev *hwdev);\n \n /**\n  * Clear port stats\n@@ -790,7 +790,7 @@ int spnic_clear_vport_stats(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_clear_phy_port_stats(void *hwdev);\n+int spnic_clear_phy_port_stats(struct spnic_hwdev *hwdev);\n \n /**\n  * Init nic hwdev\n@@ -801,7 +801,7 @@ int spnic_clear_phy_port_stats(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_init_nic_hwdev(void *hwdev);\n+int spnic_init_nic_hwdev(struct spnic_hwdev *hwdev);\n \n /**\n  * Free nic hwdev\n@@ -809,7 +809,7 @@ int spnic_init_nic_hwdev(void *hwdev);\n  * @param[in] hwdev\n  *   Device pointer to hwdev\n  */\n-void spnic_free_nic_hwdev(void *hwdev);\n+void spnic_free_nic_hwdev(struct spnic_hwdev *hwdev);\n \n /**\n  * Set function rx mode\n@@ -822,7 +822,7 @@ void spnic_free_nic_hwdev(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_rx_mode(void *hwdev, u32 enable);\n+int spnic_set_rx_mode(struct spnic_hwdev *hwdev, u32 enable);\n \n /**\n  * Set function vlan offload valid state\n@@ -835,7 +835,7 @@ int spnic_set_rx_mode(void *hwdev, u32 enable);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_rx_vlan_offload(void *hwdev, u8 en);\n+int spnic_set_rx_vlan_offload(struct spnic_hwdev *hwdev, u8 en);\n \n /**\n  * Set rx LRO configuration\n@@ -852,7 +852,7 @@ int spnic_set_rx_vlan_offload(void *hwdev, u8 en);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_rx_lro_state(void *hwdev, u8 lro_en, u32 lro_timer,\n+int spnic_set_rx_lro_state(struct spnic_hwdev *hwdev, u8 lro_en, u32 lro_timer,\n \t\t\t   u32 lro_max_pkt_len);\n \n /**\n@@ -866,9 +866,9 @@ int spnic_set_rx_lro_state(void *hwdev, u8 lro_en, u32 lro_timer,\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_port_info(void *hwdev, struct nic_port_info *port_info);\n+int spnic_get_port_info(struct spnic_hwdev *hwdev, struct nic_port_info *port_info);\n \n-int spnic_init_function_table(void *hwdev, u16 rx_buff_len);\n+int spnic_init_function_table(struct spnic_hwdev *hwdev, u16 rx_buff_len);\n \n /**\n  * Alloc RSS template table\n@@ -879,7 +879,7 @@ int spnic_init_function_table(void *hwdev, u16 rx_buff_len);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_template_alloc(void *hwdev);\n+int spnic_rss_template_alloc(struct spnic_hwdev *hwdev);\n \n /**\n  * Free RSS template table\n@@ -890,7 +890,7 @@ int spnic_rss_template_alloc(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_template_free(void *hwdev);\n+int spnic_rss_template_free(struct spnic_hwdev *hwdev);\n \n /**\n  * Set RSS indirect table\n@@ -903,7 +903,7 @@ int spnic_rss_template_free(void *hwdev);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_set_indir_tbl(void *hwdev, const u32 *indir_table);\n+int spnic_rss_set_indir_tbl(struct spnic_hwdev *hwdev, const u32 *indir_table);\n \n /**\n  * Get RSS indirect table\n@@ -916,7 +916,7 @@ int spnic_rss_set_indir_tbl(void *hwdev, const u32 *indir_table);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_get_indir_tbl(void *hwdev, u32 *indir_table);\n+int spnic_rss_get_indir_tbl(struct spnic_hwdev *hwdev, u32 *indir_table);\n \n /**\n  * Set RSS type\n@@ -929,7 +929,7 @@ int spnic_rss_get_indir_tbl(void *hwdev, u32 *indir_table);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_rss_type(void *hwdev, struct spnic_rss_type rss_type);\n+int spnic_set_rss_type(struct spnic_hwdev *hwdev, struct spnic_rss_type rss_type);\n \n /**\n  * Get RSS type\n@@ -942,7 +942,7 @@ int spnic_set_rss_type(void *hwdev, struct spnic_rss_type rss_type);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_get_rss_type(void *hwdev, struct spnic_rss_type *rss_type);\n+int spnic_get_rss_type(struct spnic_hwdev *hwdev, struct spnic_rss_type *rss_type);\n \n /**\n  * Get RSS hash engine\n@@ -955,7 +955,7 @@ int spnic_get_rss_type(void *hwdev, struct spnic_rss_type *rss_type);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_get_hash_engine(void *hwdev, u8 *type);\n+int spnic_rss_get_hash_engine(struct spnic_hwdev *hwdev, u8 *type);\n \n /**\n  * Set RSS hash engine\n@@ -968,7 +968,7 @@ int spnic_rss_get_hash_engine(void *hwdev, u8 *type);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_set_hash_engine(void *hwdev, u8 type);\n+int spnic_rss_set_hash_engine(struct spnic_hwdev *hwdev, u8 type);\n \n /**\n  * Set RSS configuration\n@@ -985,7 +985,7 @@ int spnic_rss_set_hash_engine(void *hwdev, u8 type);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_cfg(void *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc);\n+int spnic_rss_cfg(struct spnic_hwdev *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc);\n \n /**\n  * Set RSS hash key\n@@ -998,7 +998,7 @@ int spnic_rss_cfg(void *hwdev, u8 rss_en, u8 tc_num, u8 *prio_tc);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_set_hash_key(void *hwdev, u8 *key);\n+int spnic_rss_set_hash_key(struct spnic_hwdev *hwdev, u8 *key);\n \n /**\n  * Get RSS hash key\n@@ -1011,7 +1011,7 @@ int spnic_rss_set_hash_key(void *hwdev, u8 *key);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_rss_get_hash_key(void *hwdev, u8 *key);\n+int spnic_rss_get_hash_key(struct spnic_hwdev *hwdev, u8 *key);\n \n /**\n  * Add vlan to hardware\n@@ -1026,7 +1026,7 @@ int spnic_rss_get_hash_key(void *hwdev, u8 *key);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_add_vlan(void *hwdev, u16 vlan_id, u16 func_id);\n+int spnic_add_vlan(struct spnic_hwdev *hwdev, u16 vlan_id, u16 func_id);\n \n /**\n  * Delete vlan\n@@ -1041,7 +1041,7 @@ int spnic_add_vlan(void *hwdev, u16 vlan_id, u16 func_id);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_del_vlan(void *hwdev, u16 vlan_id, u16 func_id);\n+int spnic_del_vlan(struct spnic_hwdev *hwdev, u16 vlan_id, u16 func_id);\n \n /**\n  * Set vlan filter\n@@ -1054,7 +1054,7 @@ int spnic_del_vlan(void *hwdev, u16 vlan_id, u16 func_id);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_vlan_fliter(void *hwdev, u32 vlan_filter_ctrl);\n+int spnic_set_vlan_fliter(struct spnic_hwdev *hwdev, u32 vlan_filter_ctrl);\n \n /**\n  * Get VF function default cos\n@@ -1067,7 +1067,7 @@ int spnic_set_vlan_fliter(void *hwdev, u32 vlan_filter_ctrl);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_vf_get_default_cos(void *hwdev, u8 *cos_id);\n+int spnic_vf_get_default_cos(struct spnic_hwdev *hwdev, u8 *cos_id);\n \n /**\n  * Flush rx queue resource\n@@ -1080,7 +1080,7 @@ int spnic_vf_get_default_cos(void *hwdev, u8 *cos_id);\n  * @retval zero : Success\n  * @retval non-zero : Failure\n  */\n-int spnic_set_rq_flush(void *hwdev, u16 q_id);\n+int spnic_set_rq_flush(struct spnic_hwdev *hwdev, u16 q_id);\n \n /**\n  * Get service feature HW supported\n@@ -1094,7 +1094,7 @@ int spnic_set_rq_flush(void *hwdev, u16 q_id);\n  * @retval zero: Success\n  * @retval non-zero: Failure\n  */\n-int spnic_get_feature_from_hw(void *hwdev, u64 *s_feature, u16 size);\n+int spnic_get_feature_from_hw(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size);\n \n /**\n  * Set service feature driver supported to hardware\n@@ -1105,6 +1105,6 @@ int spnic_get_feature_from_hw(void *hwdev, u64 *s_feature, u16 size);\n  * @retval zero: Success\n  * @retval non-zero: Failure\n  */\n-int spnic_set_feature_to_hw(void *hwdev, u64 *s_feature, u16 size);\n+int spnic_set_feature_to_hw(struct spnic_hwdev *hwdev, u64 *s_feature, u16 size);\n \n #endif /* _SPNIC_NIC_CFG_H_ */\ndiff --git a/drivers/net/spnic/base/spnic_nic_event.c b/drivers/net/spnic/base/spnic_nic_event.c\nindex 1a8f723a77..9c3d76ce57 100644\n--- a/drivers/net/spnic/base/spnic_nic_event.c\n+++ b/drivers/net/spnic/base/spnic_nic_event.c\n@@ -6,10 +6,10 @@\n \n #include \"spnic_compat.h\"\n #include \"spnic_cmd.h\"\n-#include \"spnic_hwif.h\"\n #include \"spnic_hwdev.h\"\n #include \"spnic_mgmt.h\"\n #include \"spnic_nic_cfg.h\"\n+#include \"spnic_hwif.h\"\n #include \"spnic_hwdev.h\"\n #include \"spnic_nic_event.h\"\n \n@@ -45,9 +45,8 @@ void spnic_get_port_link_info(struct spnic_hwdev *hwdev, u8 link_state,\n \t}\n }\n \n-static void spnic_link_event_stats(void *dev, u8 link)\n+static void spnic_link_event_stats(struct spnic_hwdev *hwdev, u8 link)\n {\n-\tstruct spnic_hwdev *hwdev = dev;\n \tstruct link_event_stats *stats = &hwdev->hw_stats.link_event_stats;\n \n \tif (link)\n@@ -56,14 +55,13 @@ static void spnic_link_event_stats(void *dev, u8 link)\n \t\t__atomic_fetch_add(&stats->link_down_stats, 1, __ATOMIC_RELAXED);\n }\n \n-static void link_status_event_handler(void *hwdev, void *buf_in,\n+static void link_status_event_handler(struct spnic_hwdev *hwdev, void *buf_in,\n \t\t\t\t      __rte_unused u16 in_size,\n \t\t\t\t      __rte_unused void *buf_out,\n \t\t\t\t      __rte_unused u16 *out_size)\n {\n \tstruct spnic_cmd_link_state *link_status = NULL;\n \tstruct rte_eth_link link;\n-\tstruct spnic_hwdev *dev = hwdev;\n \tint err;\n \n \tlink_status = buf_in;\n@@ -74,24 +72,24 @@ static void link_status_event_handler(void *hwdev, void *buf_in,\n \tspnic_link_event_stats(hwdev, link_status->state);\n \n \t/* Link event reported only after set vport enable */\n-\tspnic_get_port_link_info(dev, link_status->state, &link);\n-\terr = rte_eth_linkstatus_set((struct rte_eth_dev *)(dev->eth_dev),\n+\tspnic_get_port_link_info(hwdev, link_status->state, &link);\n+\terr = rte_eth_linkstatus_set((struct rte_eth_dev *)(hwdev->eth_dev),\n \t\t\t\t     &link);\n \tif (!err)\n-\t\trte_eth_dev_callback_process(dev->eth_dev,\n+\t\trte_eth_dev_callback_process(hwdev->eth_dev,\n \t\t\t\t\t      RTE_ETH_EVENT_INTR_LSC, NULL);\n }\n \n struct nic_event_handler {\n \tu16 cmd;\n-\tvoid (*handler)(void *hwdev, void *buf_in, u16 in_size,\n+\tvoid (*handler)(struct spnic_hwdev *hwdev, void *buf_in, u16 in_size,\n \t\t\tvoid *buf_out, u16 *out_size);\n };\n \n struct nic_event_handler nic_cmd_handler[] = {\n };\n \n-static void nic_event_handler(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n+static void nic_event_handler(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in, u16 in_size,\n \t\t\t      void *buf_out, u16 *out_size)\n {\n \tu32 i, size = ARRAY_LEN(nic_cmd_handler);\n@@ -119,7 +117,7 @@ static void nic_event_handler(void *hwdev, u16 cmd, void *buf_in, u16 in_size,\n  * VF link change event\n  * VF fault report event\n  */\n-int spnic_vf_event_handler(void *hwdev, __rte_unused void *pri_handle,\n+int spnic_vf_event_handler(struct spnic_hwdev *hwdev, __rte_unused void *pri_handle,\n \t\t\t   u16 cmd, void *buf_in, u16 in_size,\n \t\t\t   void *buf_out, u16 *out_size)\n {\n@@ -128,7 +126,7 @@ int spnic_vf_event_handler(void *hwdev, __rte_unused void *pri_handle,\n }\n \n /*  NIC event of PF/PPF handler reported by mgmt cpu */\n-void spnic_pf_event_handler(void *hwdev, __rte_unused void *pri_handle,\n+void spnic_pf_event_handler(struct spnic_hwdev *hwdev, __rte_unused void *pri_handle,\n \t\t\t    u16 cmd, void *buf_in, u16 in_size,\n \t\t\t    void *buf_out, u16 *out_size)\n {\n@@ -142,7 +140,7 @@ static struct nic_event_handler mag_cmd_handler[] = {\n \t},\n };\n \n-static int spnic_mag_event_handler(void *hwdev, u16 cmd, void *buf_in,\n+static int spnic_mag_event_handler(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in,\n \t\t\t\t   u16 in_size, void *buf_out,\n \t\t\t\t   u16 *out_size)\n {\n@@ -168,14 +166,14 @@ static int spnic_mag_event_handler(void *hwdev, u16 cmd, void *buf_in,\n \treturn 0;\n }\n \n-int spnic_vf_mag_event_handler(void *hwdev, u16 cmd, void *buf_in, u16 in_size, void *buf_out,\n-\t\t\t       u16 *out_size)\n+int spnic_vf_mag_event_handler(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in,\n+\t\t\t       u16 in_size, void *buf_out, u16 *out_size)\n {\n \treturn spnic_mag_event_handler(hwdev, cmd, buf_in, in_size, buf_out,\n \t\t\t\t       out_size);\n }\n \n-u8 spnic_nic_sw_aeqe_handler(__rte_unused void *hwdev, u8 event, u8 *data)\n+u8 spnic_nic_sw_aeqe_handler(__rte_unused struct spnic_hwdev *hwdev, u8 event, u8 *data)\n {\n \tPMD_DRV_LOG(ERR,\n \t\t    \"Received nic ucode aeq event type: 0x%x, data: %\" PRIu64 \"\",\ndiff --git a/drivers/net/spnic/base/spnic_nic_event.h b/drivers/net/spnic/base/spnic_nic_event.h\nindex 89d09a2b24..4859481be1 100644\n--- a/drivers/net/spnic/base/spnic_nic_event.h\n+++ b/drivers/net/spnic/base/spnic_nic_event.h\n@@ -8,17 +8,17 @@\n void spnic_get_port_link_info(struct spnic_hwdev *hwdev, u8 link_state,\n \t\t   struct rte_eth_link *link);\n \n-void spnic_pf_event_handler(void *hwdev, __rte_unused void *pri_handle,\n+void spnic_pf_event_handler(struct spnic_hwdev *hwdev, __rte_unused void *pri_handle,\n \t\t\t    u16 cmd, void *buf_in, u16 in_size,\n \t\t\t    void *buf_out, u16 *out_size);\n \n-int spnic_vf_event_handler(void *hwdev, __rte_unused void *pri_handle,\n+int spnic_vf_event_handler(struct spnic_hwdev *hwdev, __rte_unused void *pri_handle,\n \t\t\t   u16 cmd, void *buf_in, u16 in_size,\n \t\t\t   void *buf_out, u16 *out_size);\n \n-int spnic_vf_mag_event_handler(void *hwdev, u16 cmd, void *buf_in, u16 in_size, void *buf_out,\n-\t\t\t       u16 *out_size);\n+int spnic_vf_mag_event_handler(struct spnic_hwdev *hwdev, u16 cmd, void *buf_in,\n+\t\t\t       u16 in_size, void *buf_out, u16 *out_size);\n \n-u8 spnic_nic_sw_aeqe_handler(__rte_unused void *hwdev, u8 event, u8 *data);\n+u8 spnic_nic_sw_aeqe_handler(__rte_unused struct spnic_hwdev *hwdev, u8 event, u8 *data);\n \n #endif /* _SPNIC_NIC_EVENT_H_ */\ndiff --git a/drivers/net/spnic/base/spnic_wq.c b/drivers/net/spnic/base/spnic_wq.c\nindex fced7eb0ab..1aac74566f 100644\n--- a/drivers/net/spnic/base/spnic_wq.c\n+++ b/drivers/net/spnic/base/spnic_wq.c\n@@ -67,10 +67,9 @@ void *spnic_read_wqe(struct spnic_wq *wq, int num_wqebbs, u16 *cons_idx)\n \treturn WQ_WQE_ADDR(wq, (u32)(*cons_idx));\n }\n \n-int spnic_cmdq_alloc(struct spnic_wq *wq, void *dev, int cmdq_blocks,\n+int spnic_cmdq_alloc(struct spnic_wq *wq, struct spnic_hwdev *hwdev, int cmdq_blocks,\n \t\t     u32 wq_buf_size, u32 wqebb_shift, u16 q_depth)\n {\n-\tstruct spnic_hwdev *hwdev = (struct spnic_hwdev *)dev;\n \tint i, j;\n \tint err;\n \ndiff --git a/drivers/net/spnic/base/spnic_wq.h b/drivers/net/spnic/base/spnic_wq.h\nindex 19f604a79e..b8fbf9886d 100644\n--- a/drivers/net/spnic/base/spnic_wq.h\n+++ b/drivers/net/spnic/base/spnic_wq.h\n@@ -107,7 +107,7 @@ struct spnic_wq {\n \n void spnic_wq_wqe_pg_clear(struct spnic_wq *wq);\n \n-int spnic_cmdq_alloc(struct spnic_wq *wq, void *dev, int cmdq_blocks,\n+int spnic_cmdq_alloc(struct spnic_wq *wq, struct spnic_hwdev *hwdev, int cmdq_blocks,\n \t\t      u32 wq_buf_size, u32 wqebb_shift, u16 q_depth);\n \n void spnic_cmdq_free(struct spnic_wq *wq, int cmdq_blocks);\ndiff --git a/drivers/net/spnic/spnic_ethdev.c b/drivers/net/spnic/spnic_ethdev.c\nindex 05a0fd588d..dcc5bce9b7 100644\n--- a/drivers/net/spnic/spnic_ethdev.c\n+++ b/drivers/net/spnic/spnic_ethdev.c\n@@ -15,20 +15,20 @@\n #include \"base/spnic_compat.h\"\n #include \"base/spnic_cmd.h\"\n #include \"base/spnic_csr.h\"\n+#include \"base/spnic_hwdev.h\"\n #include \"base/spnic_wq.h\"\n #include \"base/spnic_eqs.h\"\n #include \"base/spnic_mgmt.h\"\n #include \"base/spnic_cmdq.h\"\n-#include \"base/spnic_hwdev.h\"\n #include \"base/spnic_hwif.h\"\n #include \"base/spnic_hw_cfg.h\"\n #include \"base/spnic_hw_comm.h\"\n #include \"base/spnic_nic_cfg.h\"\n #include \"base/spnic_nic_event.h\"\n+#include \"spnic_ethdev.h\"\n #include \"spnic_io.h\"\n #include \"spnic_tx.h\"\n #include \"spnic_rx.h\"\n-#include \"spnic_ethdev.h\"\n \n #define SPNIC_MIN_RX_BUF_SIZE\t\t1024\n \n@@ -1252,7 +1252,7 @@ static void spnic_enable_interrupt(struct rte_eth_dev *dev)\n #define SPNIC_TXRX_MSIX_COALESC_TIMER       2\n #define SPNIC_TXRX_MSIX_RESEND_TIMER_CFG    7\n \n-static int spnic_init_rxq_msix_attr(void *hwdev, u16 msix_index)\n+static int spnic_init_rxq_msix_attr(struct spnic_hwdev *hwdev, u16 msix_index)\n {\n \tstruct interrupt_info info = { 0 };\n \tint err;\n@@ -1400,9 +1400,9 @@ static int spnic_dev_start(struct rte_eth_dev *eth_dev)\n \t\tgoto init_func_tbl_fail;\n \t}\n \n-\tnic_features = spnic_get_driver_feature(nic_dev->hwdev);\n+\tnic_features = spnic_get_driver_feature(nic_dev);\n \tnic_features &= DEFAULT_DRV_FEATURE;\n-\tspnic_update_driver_feature(nic_dev->hwdev, nic_features);\n+\tspnic_update_driver_feature(nic_dev, nic_features);\n \n \terr = spnic_set_feature_to_hw(nic_dev->hwdev, &nic_dev->feature_cap, 1);\n \tif (err) {\n@@ -2995,7 +2995,6 @@ static int spnic_func_init(struct rte_eth_dev *eth_dev)\n \t\tgoto alloc_mc_list_fail;\n \t}\n \n-\teth_dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;\n \t/* Create hardware device */\n \tnic_dev->hwdev = rte_zmalloc(\"spnic_hwdev\", sizeof(*nic_dev->hwdev),\n \t\t\t\t     RTE_CACHE_LINE_SIZE);\ndiff --git a/drivers/net/spnic/spnic_io.c b/drivers/net/spnic/spnic_io.c\nindex 3603d83e5f..b0866774dc 100644\n--- a/drivers/net/spnic/spnic_io.c\n+++ b/drivers/net/spnic/spnic_io.c\n@@ -17,17 +17,17 @@\n \n #include \"base/spnic_compat.h\"\n #include \"base/spnic_cmd.h\"\n-#include \"base/spnic_wq.h\"\n #include \"base/spnic_mgmt.h\"\n-#include \"base/spnic_cmdq.h\"\n #include \"base/spnic_hwdev.h\"\n+#include \"base/spnic_wq.h\"\n+#include \"base/spnic_cmdq.h\"\n #include \"base/spnic_hw_comm.h\"\n #include \"base/spnic_nic_cfg.h\"\n #include \"base/spnic_hw_cfg.h\"\n-#include \"spnic_io.h\"\n #include \"spnic_tx.h\"\n-#include \"spnic_rx.h\"\n #include \"spnic_ethdev.h\"\n+#include \"spnic_io.h\"\n+#include \"spnic_rx.h\"\n \n #define SPNIC_DEAULT_TX_CI_PENDING_LIMIT\t0\n #define SPNIC_DEAULT_TX_CI_COALESCING_TIME\t0\n@@ -616,9 +616,8 @@ static int clean_qp_offload_ctxt(struct spnic_nic_dev *nic_dev)\n \t\tclean_queue_offload_ctxt(nic_dev, SPNIC_QP_CTXT_TYPE_RQ));\n }\n \n-void spnic_get_func_rx_buf_size(void *dev)\n+void spnic_get_func_rx_buf_size(struct spnic_nic_dev *nic_dev)\n {\n-\tstruct spnic_nic_dev *nic_dev = (struct spnic_nic_dev *)dev;\n \tstruct spnic_rxq *rxq = NULL;\n \tu16 q_id;\n \tu16 buf_size = 0;\n@@ -639,19 +638,17 @@ void spnic_get_func_rx_buf_size(void *dev)\n }\n \n /* Init qps ctxt and set sq ci attr and arm all sq */\n-int spnic_init_qp_ctxts(void *dev)\n+int spnic_init_qp_ctxts(struct spnic_nic_dev *nic_dev)\n {\n-\tstruct spnic_nic_dev *nic_dev = NULL;\n \tstruct spnic_hwdev *hwdev = NULL;\n \tstruct spnic_sq_attr sq_attr;\n \tu32 rq_depth;\n \tu16 q_id;\n \tint err;\n \n-\tif (!dev)\n+\tif (!nic_dev)\n \t\treturn -EINVAL;\n \n-\tnic_dev = (struct spnic_nic_dev *)dev;\n \thwdev = nic_dev->hwdev;\n \n \terr = init_sq_ctxts(nic_dev);\n@@ -703,7 +700,7 @@ int spnic_init_qp_ctxts(void *dev)\n \treturn err;\n }\n \n-void spnic_free_qp_ctxts(void *hwdev)\n+void spnic_free_qp_ctxts(struct spnic_hwdev *hwdev)\n {\n \tif (!hwdev)\n \t\treturn;\n@@ -711,28 +708,21 @@ void spnic_free_qp_ctxts(void *hwdev)\n \tspnic_clean_root_ctxt(hwdev);\n }\n \n-void spnic_update_driver_feature(void *dev, u64 s_feature)\n+void spnic_update_driver_feature(struct spnic_nic_dev *nic_dev, u64 s_feature)\n {\n-\tstruct spnic_nic_dev *nic_dev = NULL;\n-\n-\tif (!dev)\n+\tif (!nic_dev)\n \t\treturn;\n \n-\tnic_dev = (struct spnic_nic_dev *)dev;\n \tnic_dev->feature_cap = s_feature;\n \n \tPMD_DRV_LOG(INFO, \"Update nic feature to %\" PRIu64 \"\\n\",\n \t\t    nic_dev->feature_cap);\n }\n \n-u64 spnic_get_driver_feature(void *dev)\n+u64 spnic_get_driver_feature(struct spnic_nic_dev *nic_dev)\n {\n-\tstruct spnic_nic_dev *nic_dev = NULL;\n-\n-\tif (!dev)\n+\tif (!nic_dev)\n \t\treturn -EINVAL;\n \n-\tnic_dev = (struct spnic_nic_dev *)dev;\n-\n \treturn nic_dev->feature_cap;\n }\ndiff --git a/drivers/net/spnic/spnic_io.h b/drivers/net/spnic/spnic_io.h\nindex ccb8044481..6e4062d712 100644\n--- a/drivers/net/spnic/spnic_io.h\n+++ b/drivers/net/spnic/spnic_io.h\n@@ -107,7 +107,7 @@ static inline void spnic_write_db(void *db_addr, u16 q_id, int cos, u8 cflag,\n \trte_write64(*((u64 *)&db), DB_ADDR(db_addr, pi));\n }\n \n-void spnic_get_func_rx_buf_size(void *dev);\n+void spnic_get_func_rx_buf_size(struct spnic_nic_dev *nic_dev);\n \n /**\n  * Init queue pair context\n@@ -118,7 +118,7 @@ void spnic_get_func_rx_buf_size(void *dev);\n  * @retval zero: Success\n  * @retval non-zero: Failure\n  */\n-int spnic_init_qp_ctxts(void *dev);\n+int spnic_init_qp_ctxts(struct spnic_nic_dev *nic_dev);\n \n /**\n  * Free queue pair context\n@@ -126,7 +126,7 @@ int spnic_init_qp_ctxts(void *dev);\n  * @param[in] hwdev\n  *   Device pointer to hwdev\n  */\n-void spnic_free_qp_ctxts(void *hwdev);\n+void spnic_free_qp_ctxts(struct spnic_hwdev *hwdev);\n \n /**\n  * Update service feature driver supported\n@@ -138,7 +138,7 @@ void spnic_free_qp_ctxts(void *hwdev);\n  * @retval zero: Success\n  * @retval non-zero: Failure\n  */\n-void spnic_update_driver_feature(void *dev, u64 s_feature);\n+void spnic_update_driver_feature(struct spnic_nic_dev *nic_dev, u64 s_feature);\n \n /**\n  * Get service feature driver supported\n@@ -150,5 +150,5 @@ void spnic_update_driver_feature(void *dev, u64 s_feature);\n  * @retval zero: Success\n  * @retval non-zero: Failure\n  */\n-u64 spnic_get_driver_feature(void *dev);\n+u64 spnic_get_driver_feature(struct spnic_nic_dev *nic_dev);\n #endif /* _SPNIC_IO_H_ */\ndiff --git a/drivers/net/spnic/spnic_rx.c b/drivers/net/spnic/spnic_rx.c\nindex 8d307ef7a0..692dc18146 100644\n--- a/drivers/net/spnic/spnic_rx.c\n+++ b/drivers/net/spnic/spnic_rx.c\n@@ -8,14 +8,14 @@\n \n #include \"base/spnic_compat.h\"\n #include \"base/spnic_cmd.h\"\n-#include \"base/spnic_hwif.h\"\n #include \"base/spnic_hwdev.h\"\n+#include \"base/spnic_hwif.h\"\n #include \"base/spnic_wq.h\"\n #include \"base/spnic_mgmt.h\"\n #include \"base/spnic_nic_cfg.h\"\n+#include \"spnic_ethdev.h\"\n #include \"spnic_io.h\"\n #include \"spnic_rx.h\"\n-#include \"spnic_ethdev.h\"\n \n /**\n  * Get receive queue wqe\ndiff --git a/drivers/net/spnic/spnic_tx.c b/drivers/net/spnic/spnic_tx.c\nindex f893d6cb26..b3361a0178 100644\n--- a/drivers/net/spnic/spnic_tx.c\n+++ b/drivers/net/spnic/spnic_tx.c\n@@ -9,13 +9,13 @@\n \n #include \"base/spnic_compat.h\"\n #include \"base/spnic_cmd.h\"\n+#include \"base/spnic_hwdev.h\"\n #include \"base/spnic_wq.h\"\n #include \"base/spnic_mgmt.h\"\n-#include \"base/spnic_hwdev.h\"\n #include \"base/spnic_nic_cfg.h\"\n-#include \"spnic_io.h\"\n #include \"spnic_tx.h\"\n #include \"spnic_ethdev.h\"\n+#include \"spnic_io.h\"\n \n #define SPNIC_TX_TASK_WRAPPED\t\t1\n #define SPNIC_TX_BD_DESC_WRAPPED\t2\n",
    "prefixes": [
        "v5",
        "26/26"
    ]
}