Patch Detail

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

{
    "id": 52184,
    "url": "http://patches.dpdk.org/api/patches/52184/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/1554292065-186702-14-git-send-email-rosen.xu@intel.com/",
    "project": {
        "id": 1,
        "url": "http://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": "<1554292065-186702-14-git-send-email-rosen.xu@intel.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/1554292065-186702-14-git-send-email-rosen.xu@intel.com",
    "date": "2019-04-03T11:47:44",
    "name": "[v5,13/14] raw/ifpga/base: using prefix name \"ifpga_\" for feature and feature_ops data struct",
    "commit_ref": null,
    "pull_url": null,
    "state": "changes-requested",
    "archived": true,
    "hash": "950eb949db0a4edf2867476b4a3a41eae1fe4d05",
    "submitter": {
        "id": 946,
        "url": "http://patches.dpdk.org/api/people/946/?format=api",
        "name": "Xu, Rosen",
        "email": "rosen.xu@intel.com"
    },
    "delegate": {
        "id": 319,
        "url": "http://patches.dpdk.org/api/users/319/?format=api",
        "username": "fyigit",
        "first_name": "Ferruh",
        "last_name": "Yigit",
        "email": "ferruh.yigit@amd.com"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/1554292065-186702-14-git-send-email-rosen.xu@intel.com/mbox/",
    "series": [
        {
            "id": 4084,
            "url": "http://patches.dpdk.org/api/series/4084/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=4084",
            "date": "2019-04-03T11:47:31",
            "name": "Add patch set for IPN3KE",
            "version": 5,
            "mbox": "http://patches.dpdk.org/series/4084/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/52184/comments/",
    "check": "success",
    "checks": "http://patches.dpdk.org/api/patches/52184/checks/",
    "tags": {},
    "related": [],
    "headers": {
        "Return-Path": "<dev-bounces@dpdk.org>",
        "X-Original-To": "patchwork@dpdk.org",
        "Delivered-To": "patchwork@dpdk.org",
        "Received": [
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 49F511B455;\n\tWed,  3 Apr 2019 13:47:31 +0200 (CEST)",
            "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id DFC631B43A\n\tfor <dev@dpdk.org>; Wed,  3 Apr 2019 13:47:23 +0200 (CEST)",
            "from fmsmga005.fm.intel.com ([10.253.24.32])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t03 Apr 2019 04:47:23 -0700",
            "from dpdkx8602.sh.intel.com ([10.67.110.200])\n\tby fmsmga005.fm.intel.com with ESMTP; 03 Apr 2019 04:47:21 -0700"
        ],
        "X-Amp-Result": "SKIPPED(no attachment in message)",
        "X-Amp-File-Uploaded": "False",
        "X-ExtLoop1": "1",
        "X-IronPort-AV": "E=Sophos;i=\"5.60,304,1549958400\"; d=\"scan'208\";a=\"334606370\"",
        "From": "Rosen Xu <rosen.xu@intel.com>",
        "To": "dev@dpdk.org",
        "Cc": "ferruh.yigit@intel.com, tianfei.zhang@intel.com, dan.wei@intel.com,\n\trosen.xu@intel.com, andy.pei@intel.com, qiming.yang@intel.com,\n\thaiyue.wang@intel.com, santos.chen@intel.com, zhang.zhang@intel.com, \n\tdavid.lomartire@intel.com",
        "Date": "Wed,  3 Apr 2019 19:47:44 +0800",
        "Message-Id": "<1554292065-186702-14-git-send-email-rosen.xu@intel.com>",
        "X-Mailer": "git-send-email 1.8.3.1",
        "In-Reply-To": "<1554292065-186702-1-git-send-email-rosen.xu@intel.com>",
        "References": "<1551338000-120348-1-git-send-email-rosen.xu@intel.com>\n\t<1554292065-186702-1-git-send-email-rosen.xu@intel.com>",
        "Subject": "[dpdk-dev] [PATCH v5 13/14] raw/ifpga/base: using prefix name\n\t\"ifpga_\" for feature and feature_ops data struct",
        "X-BeenThere": "dev@dpdk.org",
        "X-Mailman-Version": "2.1.15",
        "Precedence": "list",
        "List-Id": "DPDK patches and discussions <dev.dpdk.org>",
        "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>",
        "Errors-To": "dev-bounces@dpdk.org",
        "Sender": "\"dev\" <dev-bounces@dpdk.org>"
    },
    "content": "From: \"Zhang, Tianfei\" <tianfei.zhang@intel.com>\n\nUsing prefix name \"ifpga_\" for feature and feature_ops data\nstruct on ifpga base code, which is suggested by Yigit, Ferruh.\n\nSigned-off-by: Zhang, Tianfei <tianfei.zhang@intel.com>\n---\n drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c   |  8 +--\n drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c |  4 +-\n drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h | 58 ++++++++++---------\n drivers/raw/ifpga_rawdev/base/ifpga_fme.c         | 70 +++++++++++------------\n drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c   | 16 +++---\n drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c   | 18 +++---\n drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c   | 28 ++++-----\n drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c      |  6 +-\n drivers/raw/ifpga_rawdev/base/ifpga_hw.h          | 22 +++----\n drivers/raw/ifpga_rawdev/base/ifpga_port.c        | 36 ++++++------\n drivers/raw/ifpga_rawdev/base/ifpga_port_error.c  | 10 ++--\n 11 files changed, 141 insertions(+), 135 deletions(-)",
    "diff": "diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c b/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c\nindex 44086c1..b8846e3 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c\n@@ -73,7 +73,7 @@ static u64 feature_id(void __iomem *start)\n \t\tunsigned int vec_cnt)\n {\n \tstruct ifpga_hw *hw = binfo->hw;\n-\tstruct feature *feature = NULL;\n+\tstruct ifpga_feature *feature = NULL;\n \tstruct feature_irq_ctx *ctx = NULL;\n \tint port_id, ret = 0;\n \tunsigned int i;\n@@ -81,7 +81,7 @@ static u64 feature_id(void __iomem *start)\n \tfid = fid?fid:feature_id(start);\n \tsize = size?size:feature_size(start);\n \n-\tfeature = opae_malloc(sizeof(struct feature));\n+\tfeature = opae_malloc(sizeof(struct ifpga_feature));\n \tif (!feature)\n \t\treturn -ENOMEM;\n \n@@ -233,7 +233,7 @@ static int build_info_commit_dev(struct build_feature_devs_info *binfo)\n \tstruct opae_accelerator *acc;\n \tstruct ifpga_port_hw *port;\n \tstruct ifpga_fme_hw *fme;\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!binfo->fiu)\n \t\treturn 0;\n@@ -645,7 +645,7 @@ static void ifpga_print_device_feature_list(struct ifpga_hw *hw)\n {\n \tstruct ifpga_fme_hw *fme = &hw->fme;\n \tstruct ifpga_port_hw *port;\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \tint i;\n \n \tdev_info(hw, \"found fme_device, is in PF: %s\\n\",\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c\nindex 5ebc449..63c8bcc 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.c\n@@ -252,7 +252,7 @@ const char *get_port_feature_name(unsigned int id)\n \n static void feature_uinit(struct ifpga_feature_list *list)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tTAILQ_FOREACH(feature, list, next) {\n \t\tif (feature->state != IFPGA_FEATURE_ATTACHED)\n@@ -265,7 +265,7 @@ static void feature_uinit(struct ifpga_feature_list *list)\n static int feature_init(struct feature_driver *drv,\n \t\tstruct ifpga_feature_list *list)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \tint ret;\n \n \twhile (drv->ops) {\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h\nindex 3f63f5a..bb9fcc2 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h\n@@ -10,7 +10,7 @@\n struct feature_driver {\n \tu64 id;\n \tconst char *name;\n-\tstruct feature_ops *ops;\n+\tstruct ifpga_feature_ops *ops;\n };\n \n /**\n@@ -34,10 +34,10 @@ struct feature_driver {\n #define ifpga_for_each_port_feature(port, feature)\t\t\\\n \tTAILQ_FOREACH(feature, &port->feature_list, next)\n \n-static inline struct feature *\n+static inline struct ifpga_feature *\n get_fme_feature_by_id(struct ifpga_fme_hw *fme, u64 id)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tifpga_for_each_fme_feature(fme, feature) {\n \t\tif (feature->id == id)\n@@ -47,10 +47,10 @@ struct feature_driver {\n \treturn NULL;\n }\n \n-static inline struct feature *\n+static inline struct ifpga_feature *\n get_port_feature_by_id(struct ifpga_port_hw *port, u64 id)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tifpga_for_each_port_feature(port, feature) {\n \t\tif (feature->id == id)\n@@ -60,10 +60,10 @@ struct feature_driver {\n \treturn NULL;\n }\n \n-static inline struct feature *\n+static inline struct ifpga_feature *\n get_feature_by_id(struct ifpga_feature_list *list, u64 id)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tTAILQ_FOREACH(feature, list, next)\n \t\tif (feature->id == id)\n@@ -75,7 +75,8 @@ struct feature_driver {\n static inline void  *\n get_fme_feature_ioaddr_by_index(struct ifpga_fme_hw *fme, int index)\n {\n-\tstruct feature *feature = get_feature_by_id(&fme->feature_list, index);\n+\tstruct ifpga_feature *feature =\n+\t\tget_feature_by_id(&fme->feature_list, index);\n \n \treturn feature ? feature->addr : NULL;\n }\n@@ -83,7 +84,8 @@ struct feature_driver {\n static inline void  *\n get_port_feature_ioaddr_by_index(struct ifpga_port_hw *port, int index)\n {\n-\tstruct feature *feature = get_feature_by_id(&port->feature_list, index);\n+\tstruct ifpga_feature *feature =\n+\t\tget_feature_by_id(&port->feature_list, index);\n \n \treturn feature ? feature->addr : NULL;\n }\n@@ -162,19 +164,19 @@ int do_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size,\n void port_err_mask(struct ifpga_port_hw *port, bool mask);\n int port_err_clear(struct ifpga_port_hw *port, u64 err);\n \n-extern struct feature_ops fme_hdr_ops;\n-extern struct feature_ops fme_thermal_mgmt_ops;\n-extern struct feature_ops fme_power_mgmt_ops;\n-extern struct feature_ops fme_global_err_ops;\n-extern struct feature_ops fme_pr_mgmt_ops;\n-extern struct feature_ops fme_global_iperf_ops;\n-extern struct feature_ops fme_global_dperf_ops;\n-extern struct feature_ops fme_hssi_eth_ops;\n-extern struct feature_ops fme_emif_ops;\n-extern struct feature_ops fme_spi_master_ops;\n-extern struct feature_ops fme_i2c_master_ops;\n-extern struct feature_ops fme_eth_group_ops;\n-extern struct feature_ops fme_nios_spi_master_ops;\n+extern struct ifpga_feature_ops fme_hdr_ops;\n+extern struct ifpga_feature_ops fme_thermal_mgmt_ops;\n+extern struct ifpga_feature_ops fme_power_mgmt_ops;\n+extern struct ifpga_feature_ops fme_global_err_ops;\n+extern struct ifpga_feature_ops fme_pr_mgmt_ops;\n+extern struct ifpga_feature_ops fme_global_iperf_ops;\n+extern struct ifpga_feature_ops fme_global_dperf_ops;\n+extern struct ifpga_feature_ops fme_hssi_eth_ops;\n+extern struct ifpga_feature_ops fme_emif_ops;\n+extern struct ifpga_feature_ops fme_spi_master_ops;\n+extern struct ifpga_feature_ops fme_i2c_master_ops;\n+extern struct ifpga_feature_ops fme_eth_group_ops;\n+extern struct ifpga_feature_ops fme_nios_spi_master_ops;\n \n int port_get_prop(struct ifpga_port_hw *port, struct feature_prop *prop);\n int port_set_prop(struct ifpga_port_hw *port, struct feature_prop *prop);\n@@ -190,14 +192,14 @@ struct fpga_uafu_irq_set {\n const char *get_fme_feature_name(unsigned int id);\n const char *get_port_feature_name(unsigned int id);\n \n-extern struct feature_ops ifpga_rawdev_port_hdr_ops;\n-extern struct feature_ops ifpga_rawdev_port_error_ops;\n-extern struct feature_ops ifpga_rawdev_port_stp_ops;\n-extern struct feature_ops ifpga_rawdev_port_uint_ops;\n-extern struct feature_ops ifpga_rawdev_port_afu_ops;\n+extern struct ifpga_feature_ops ifpga_rawdev_port_hdr_ops;\n+extern struct ifpga_feature_ops ifpga_rawdev_port_error_ops;\n+extern struct ifpga_feature_ops ifpga_rawdev_port_stp_ops;\n+extern struct ifpga_feature_ops ifpga_rawdev_port_uint_ops;\n+extern struct ifpga_feature_ops ifpga_rawdev_port_afu_ops;\n \n /* help functions for feature ops */\n-int fpga_msix_set_block(struct feature *feature, unsigned int start,\n+int fpga_msix_set_block(struct ifpga_feature *feature, unsigned int start,\n \t\t\tunsigned int count, s32 *fds);\n \n /* FME network function ops*/\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme.c\nindex 2cfb158..2b447fd 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme.c\n@@ -12,7 +12,7 @@\n \n int fme_get_prop(struct ifpga_fme_hw *fme, struct feature_prop *prop)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!fme)\n \t\treturn -ENOENT;\n@@ -27,7 +27,7 @@ int fme_get_prop(struct ifpga_fme_hw *fme, struct feature_prop *prop)\n \n int fme_set_prop(struct ifpga_fme_hw *fme, struct feature_prop *prop)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!fme)\n \t\treturn -ENOENT;\n@@ -42,7 +42,7 @@ int fme_set_prop(struct ifpga_fme_hw *fme, struct feature_prop *prop)\n \n int fme_set_irq(struct ifpga_fme_hw *fme, u32 feature_id, void *irq_set)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!fme)\n \t\treturn -ENOENT;\n@@ -56,7 +56,7 @@ int fme_set_irq(struct ifpga_fme_hw *fme, u32 feature_id, void *irq_set)\n }\n \n /* fme private feature head */\n-static int fme_hdr_init(struct feature *feature)\n+static int fme_hdr_init(struct ifpga_feature *feature)\n {\n \tstruct feature_fme_header *fme_hdr;\n \n@@ -69,7 +69,7 @@ static int fme_hdr_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_hdr_uinit(struct feature *feature)\n+static void fme_hdr_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n@@ -159,7 +159,7 @@ static int fme_hdr_get_bitstream_metadata(struct ifpga_fme_hw *fme,\n }\n \n static int\n-fme_hdr_get_prop(struct feature *feature, struct feature_prop *prop)\n+fme_hdr_get_prop(struct ifpga_feature *feature, struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n \n@@ -183,7 +183,7 @@ static int fme_hdr_get_bitstream_metadata(struct ifpga_fme_hw *fme,\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_hdr_ops = {\n+struct ifpga_feature_ops fme_hdr_ops = {\n \t.init = fme_hdr_init,\n \t.uinit = fme_hdr_uinit,\n \t.get_prop = fme_hdr_get_prop,\n@@ -404,7 +404,7 @@ static int fme_thermal_get_revision(struct ifpga_fme_hw *fme, u64 *revision)\n \n #define FME_THERMAL_CAP_NO_TMP_THRESHOLD\t0x1\n \n-static int fme_thermal_mgmt_init(struct feature *feature)\n+static int fme_thermal_mgmt_init(struct ifpga_feature *feature)\n {\n \tstruct feature_fme_thermal *fme_thermal;\n \tstruct feature_fme_tmp_threshold_cap thermal_cap;\n@@ -425,7 +425,7 @@ static int fme_thermal_mgmt_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_thermal_mgmt_uinit(struct feature *feature)\n+static void fme_thermal_mgmt_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n@@ -433,7 +433,7 @@ static void fme_thermal_mgmt_uinit(struct feature *feature)\n }\n \n static int\n-fme_thermal_set_prop(struct feature *feature, struct feature_prop *prop)\n+fme_thermal_set_prop(struct ifpga_feature *feature, struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n \n@@ -453,7 +453,7 @@ static void fme_thermal_mgmt_uinit(struct feature *feature)\n }\n \n static int\n-fme_thermal_get_prop(struct feature *feature, struct feature_prop *prop)\n+fme_thermal_get_prop(struct ifpga_feature *feature, struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n \n@@ -484,7 +484,7 @@ static void fme_thermal_mgmt_uinit(struct feature *feature)\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_thermal_mgmt_ops = {\n+struct ifpga_feature_ops fme_thermal_mgmt_ops = {\n \t.init = fme_thermal_mgmt_init,\n \t.uinit = fme_thermal_mgmt_uinit,\n \t.get_prop = fme_thermal_get_prop,\n@@ -670,7 +670,7 @@ static int fme_pwr_get_revision(struct ifpga_fme_hw *fme, u64 *revision)\n \treturn 0;\n }\n \n-static int fme_power_mgmt_init(struct feature *feature)\n+static int fme_power_mgmt_init(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n@@ -679,14 +679,14 @@ static int fme_power_mgmt_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_power_mgmt_uinit(struct feature *feature)\n+static void fme_power_mgmt_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"FME power mgmt UInit.\\n\");\n }\n \n-static int fme_power_mgmt_get_prop(struct feature *feature,\n+static int fme_power_mgmt_get_prop(struct ifpga_feature *feature,\n \t\t\t\t   struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -715,7 +715,7 @@ static int fme_power_mgmt_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_power_mgmt_set_prop(struct feature *feature,\n+static int fme_power_mgmt_set_prop(struct ifpga_feature *feature,\n \t\t\t\t   struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -730,41 +730,41 @@ static int fme_power_mgmt_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_power_mgmt_ops = {\n+struct ifpga_feature_ops fme_power_mgmt_ops = {\n \t.init = fme_power_mgmt_init,\n \t.uinit = fme_power_mgmt_uinit,\n \t.get_prop = fme_power_mgmt_get_prop,\n \t.set_prop = fme_power_mgmt_set_prop,\n };\n \n-static int fme_hssi_eth_init(struct feature *feature)\n+static int fme_hssi_eth_init(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \treturn 0;\n }\n \n-static void fme_hssi_eth_uinit(struct feature *feature)\n+static void fme_hssi_eth_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n }\n \n-struct feature_ops fme_hssi_eth_ops = {\n+struct ifpga_feature_ops fme_hssi_eth_ops = {\n \t.init = fme_hssi_eth_init,\n \t.uinit = fme_hssi_eth_uinit,\n };\n \n-static int fme_emif_init(struct feature *feature)\n+static int fme_emif_init(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \treturn 0;\n }\n \n-static void fme_emif_uinit(struct feature *feature)\n+static void fme_emif_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n }\n \n-struct feature_ops fme_emif_ops = {\n+struct ifpga_feature_ops fme_emif_ops = {\n \t.init = fme_emif_init,\n \t.uinit = fme_emif_uinit,\n };\n@@ -872,7 +872,7 @@ static int spi_self_checking(void)\n \treturn 0;\n }\n \n-static int fme_spi_init(struct feature *feature)\n+static int fme_spi_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \tstruct altera_spi_device *spi_master;\n@@ -915,7 +915,7 @@ static int fme_spi_init(struct feature *feature)\n \treturn ret;\n }\n \n-static void fme_spi_uinit(struct feature *feature)\n+static void fme_spi_uinit(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \n@@ -923,7 +923,7 @@ static void fme_spi_uinit(struct feature *feature)\n \t\tintel_max10_device_remove(fme->max10_dev);\n }\n \n-struct feature_ops fme_spi_master_ops = {\n+struct ifpga_feature_ops fme_spi_master_ops = {\n \t.init = fme_spi_init,\n \t.uinit = fme_spi_uinit,\n };\n@@ -975,7 +975,7 @@ static int nios_spi_check_error(struct altera_spi_device *dev)\n \treturn 0;\n }\n \n-static int fme_nios_spi_init(struct feature *feature)\n+static int fme_nios_spi_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \tstruct altera_spi_device *spi_master;\n@@ -1036,7 +1036,7 @@ static int fme_nios_spi_init(struct feature *feature)\n \treturn -ENODEV;\n }\n \n-static void fme_nios_spi_uinit(struct feature *feature)\n+static void fme_nios_spi_uinit(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \n@@ -1044,7 +1044,7 @@ static void fme_nios_spi_uinit(struct feature *feature)\n \t\tintel_max10_device_remove(fme->max10_dev);\n }\n \n-struct feature_ops fme_nios_spi_master_ops = {\n+struct ifpga_feature_ops fme_nios_spi_master_ops = {\n \t.init = fme_nios_spi_init,\n \t.uinit = fme_nios_spi_uinit,\n };\n@@ -1082,7 +1082,7 @@ static int i2c_mac_rom_test(struct altera_i2c_dev *dev)\n \treturn 0;\n }\n \n-static int fme_i2c_init(struct feature *feature)\n+static int fme_i2c_init(struct ifpga_feature *feature)\n {\n \tstruct feature_fme_i2c *i2c;\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n@@ -1101,19 +1101,19 @@ static int fme_i2c_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_i2c_uninit(struct feature *feature)\n+static void fme_i2c_uninit(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \n \taltera_i2c_remove(fme->i2c_master);\n }\n \n-struct feature_ops fme_i2c_master_ops = {\n+struct ifpga_feature_ops fme_i2c_master_ops = {\n \t.init = fme_i2c_init,\n \t.uinit = fme_i2c_uninit,\n };\n \n-static int fme_eth_group_init(struct feature *feature)\n+static int fme_eth_group_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = (struct ifpga_fme_hw *)feature->parent;\n \tstruct eth_group_device *dev;\n@@ -1142,12 +1142,12 @@ static int fme_eth_group_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_eth_group_uinit(struct feature *feature)\n+static void fme_eth_group_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n }\n \n-struct feature_ops fme_eth_group_ops = {\n+struct ifpga_feature_ops fme_eth_group_ops = {\n \t.init = fme_eth_group_init,\n \t.uinit = fme_eth_group_uinit,\n };\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c\nindex 1773b87..954f8a8 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme_dperf.c\n@@ -183,7 +183,7 @@ static int fme_dperf_set_fab_freeze(struct ifpga_fme_hw *fme, u64 freeze)\n \n #define PERF_MAX_PORT_NUM\t1\n \n-static int fme_global_dperf_init(struct feature *feature)\n+static int fme_global_dperf_init(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n@@ -192,14 +192,14 @@ static int fme_global_dperf_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_global_dperf_uinit(struct feature *feature)\n+static void fme_global_dperf_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"FME global_dperf UInit.\\n\");\n }\n \n-static int fme_dperf_fab_get_prop(struct feature *feature,\n+static int fme_dperf_fab_get_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -225,7 +225,7 @@ static int fme_dperf_fab_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_dperf_root_get_prop(struct feature *feature,\n+static int fme_dperf_root_get_prop(struct ifpga_feature *feature,\n \t\t\t\t   struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -245,7 +245,7 @@ static int fme_dperf_root_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_dperf_get_prop(struct feature *feature,\n+static int fme_global_dperf_get_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -260,7 +260,7 @@ static int fme_global_dperf_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_dperf_fab_set_prop(struct feature *feature,\n+static int fme_dperf_fab_set_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -279,7 +279,7 @@ static int fme_dperf_fab_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_dperf_set_prop(struct feature *feature,\n+static int fme_global_dperf_set_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -292,7 +292,7 @@ static int fme_global_dperf_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_global_dperf_ops = {\n+struct ifpga_feature_ops fme_global_dperf_ops = {\n \t.init = fme_global_dperf_init,\n \t.uinit = fme_global_dperf_uinit,\n \t.get_prop = fme_global_dperf_get_prop,\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c\nindex 8c26fb2..3794564 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme_error.c\n@@ -240,7 +240,7 @@ static void fme_error_enable(struct ifpga_fme_hw *fme)\n \twriteq(0UL, &fme_err->ras_catfat_mask);\n }\n \n-static int fme_global_error_init(struct feature *feature)\n+static int fme_global_error_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n \n@@ -252,12 +252,12 @@ static int fme_global_error_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_global_error_uinit(struct feature *feature)\n+static void fme_global_error_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n }\n \n-static int fme_err_fme_err_get_prop(struct feature *feature,\n+static int fme_err_fme_err_get_prop(struct ifpga_feature *feature,\n \t\t\t\t    struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -275,7 +275,7 @@ static int fme_err_fme_err_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_err_root_get_prop(struct feature *feature,\n+static int fme_err_root_get_prop(struct ifpga_feature *feature,\n \t\t\t\t struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -301,7 +301,7 @@ static int fme_err_root_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_error_get_prop(struct feature *feature,\n+static int fme_global_error_get_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -321,7 +321,7 @@ static int fme_global_error_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_err_fme_err_set_prop(struct feature *feature,\n+static int fme_err_fme_err_set_prop(struct ifpga_feature *feature,\n \t\t\t\t    struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -335,7 +335,7 @@ static int fme_err_fme_err_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_err_root_set_prop(struct feature *feature,\n+static int fme_err_root_set_prop(struct ifpga_feature *feature,\n \t\t\t\t struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -353,7 +353,7 @@ static int fme_err_root_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_error_set_prop(struct feature *feature,\n+static int fme_global_error_set_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -373,7 +373,7 @@ static int fme_global_error_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_global_err_ops = {\n+struct ifpga_feature_ops fme_global_err_ops = {\n \t.init = fme_global_error_init,\n \t.uinit = fme_global_error_uinit,\n \t.get_prop = fme_global_error_get_prop,\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c\nindex e6c40a1..70543b9 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme_iperf.c\n@@ -407,7 +407,7 @@ static int fme_iperf_set_fab_freeze(struct ifpga_fme_hw *fme, u64 freeze)\n #define PERF_MAX_PORT_NUM\t1\n #define FME_IPERF_CAP_IOMMU\t0x1\n \n-static int fme_global_iperf_init(struct feature *feature)\n+static int fme_global_iperf_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_fme_hw *fme;\n \tstruct feature_fme_header *fme_hdr;\n@@ -429,14 +429,14 @@ static int fme_global_iperf_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_global_iperf_uinit(struct feature *feature)\n+static void fme_global_iperf_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"FME global_iperf UInit.\\n\");\n }\n \n-static int fme_iperf_root_get_prop(struct feature *feature,\n+static int fme_iperf_root_get_prop(struct ifpga_feature *feature,\n \t\t\t\t   struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -456,7 +456,7 @@ static int fme_iperf_root_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_cache_get_prop(struct feature *feature,\n+static int fme_iperf_cache_get_prop(struct ifpga_feature *feature,\n \t\t\t\t    struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -496,7 +496,7 @@ static int fme_iperf_cache_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_vtd_root_get_prop(struct feature *feature,\n+static int fme_iperf_vtd_root_get_prop(struct ifpga_feature *feature,\n \t\t\t\t       struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -534,7 +534,7 @@ static int fme_iperf_vtd_root_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_vtd_sub_get_prop(struct feature *feature,\n+static int fme_iperf_vtd_sub_get_prop(struct ifpga_feature *feature,\n \t\t\t\t      struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -571,7 +571,7 @@ static int fme_iperf_vtd_sub_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_vtd_get_prop(struct feature *feature,\n+static int fme_iperf_vtd_get_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tu8 sub = GET_FIELD(PROP_SUB, prop->prop_id);\n@@ -582,7 +582,7 @@ static int fme_iperf_vtd_get_prop(struct feature *feature,\n \treturn fme_iperf_vtd_sub_get_prop(feature, prop);\n }\n \n-static int fme_iperf_fab_get_prop(struct feature *feature,\n+static int fme_iperf_fab_get_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -626,7 +626,7 @@ static int fme_iperf_fab_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_iperf_get_prop(struct feature *feature,\n+static int fme_global_iperf_get_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -645,7 +645,7 @@ static int fme_global_iperf_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_cache_set_prop(struct feature *feature,\n+static int fme_iperf_cache_set_prop(struct ifpga_feature *feature,\n \t\t\t\t    struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -658,7 +658,7 @@ static int fme_iperf_cache_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_vtd_set_prop(struct feature *feature,\n+static int fme_iperf_vtd_set_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -671,7 +671,7 @@ static int fme_iperf_vtd_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_iperf_fab_set_prop(struct feature *feature,\n+static int fme_iperf_fab_set_prop(struct ifpga_feature *feature,\n \t\t\t\t  struct feature_prop *prop)\n {\n \tstruct ifpga_fme_hw *fme = feature->parent;\n@@ -690,7 +690,7 @@ static int fme_iperf_fab_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int fme_global_iperf_set_prop(struct feature *feature,\n+static int fme_global_iperf_set_prop(struct ifpga_feature *feature,\n \t\t\t\t     struct feature_prop *prop)\n {\n \tu8 top = GET_FIELD(PROP_TOP, prop->prop_id);\n@@ -707,7 +707,7 @@ static int fme_global_iperf_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-struct feature_ops fme_global_iperf_ops = {\n+struct ifpga_feature_ops fme_global_iperf_ops = {\n \t.init = fme_global_iperf_init,\n \t.uinit = fme_global_iperf_uinit,\n \t.get_prop = fme_global_iperf_get_prop,\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c b/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c\nindex 8890f4b..efa7266 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_fme_pr.c\n@@ -315,7 +315,7 @@ int do_pr(struct ifpga_hw *hw, u32 port_id, void *buffer, u32 size, u64 *status)\n \treturn fme_pr(hw, port_id, buf, size, status);\n }\n \n-static int fme_pr_mgmt_init(struct feature *feature)\n+static int fme_pr_mgmt_init(struct ifpga_feature *feature)\n {\n \tstruct feature_fme_pr *fme_pr;\n \tstruct feature_header fme_pr_header;\n@@ -339,14 +339,14 @@ static int fme_pr_mgmt_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void fme_pr_mgmt_uinit(struct feature *feature)\n+static void fme_pr_mgmt_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"FME PR MGMT UInit.\\n\");\n }\n \n-struct feature_ops fme_pr_mgmt_ops = {\n+struct ifpga_feature_ops fme_pr_mgmt_ops = {\n \t.init = fme_pr_mgmt_init,\n \t.uinit = fme_pr_mgmt_uinit,\n };\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h b/drivers/raw/ifpga_rawdev/base/ifpga_hw.h\nindex a428d69..ff91c46 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_hw.h\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_hw.h\n@@ -10,7 +10,7 @@\n #include \"opae_eth_group.h\"\n \n /** List of private feateues */\n-TAILQ_HEAD(ifpga_feature_list, feature);\n+TAILQ_HEAD(ifpga_feature_list, ifpga_feature);\n \n enum ifpga_feature_state {\n \tIFPGA_FEATURE_UNUSED = 0,\n@@ -27,8 +27,8 @@ struct feature_irq_ctx {\n \tint idx;\n };\n \n-struct feature {\n-\tTAILQ_ENTRY(feature)next;\n+struct ifpga_feature {\n+\tTAILQ_ENTRY(ifpga_feature)next;\n \tenum ifpga_feature_state state;\n \tenum feature_type type;\n \tconst char *name;\n@@ -44,17 +44,19 @@ struct feature {\n \n \tvoid *parent;\t\t/* to parent hw data structure */\n \n-\tstruct feature_ops *ops;/* callback to this private feature */\n+\tstruct ifpga_feature_ops *ops;/* callback to this private feature */\n \tunsigned int vec_start;\n \tunsigned int vec_cnt;\n };\n \n-struct feature_ops {\n-\tint (*init)(struct feature *feature);\n-\tvoid (*uinit)(struct feature *feature);\n-\tint (*get_prop)(struct feature *feature, struct feature_prop *prop);\n-\tint (*set_prop)(struct feature *feature, struct feature_prop *prop);\n-\tint (*set_irq)(struct feature *feature, void *irq_set);\n+struct ifpga_feature_ops {\n+\tint (*init)(struct ifpga_feature *feature);\n+\tvoid (*uinit)(struct ifpga_feature *feature);\n+\tint (*get_prop)(struct ifpga_feature *feature,\n+\t\t\tstruct feature_prop *prop);\n+\tint (*set_prop)(struct ifpga_feature *feature,\n+\t\t\tstruct feature_prop *prop);\n+\tint (*set_irq)(struct ifpga_feature *feature, void *irq_set);\n };\n \n enum ifpga_fme_state {\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c b/drivers/raw/ifpga_rawdev/base/ifpga_port.c\nindex 4628783..6c41164 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_port.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_port.c\n@@ -6,7 +6,7 @@\n \n int port_get_prop(struct ifpga_port_hw *port, struct feature_prop *prop)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!port)\n \t\treturn -ENOENT;\n@@ -21,7 +21,7 @@ int port_get_prop(struct ifpga_port_hw *port, struct feature_prop *prop)\n \n int port_set_prop(struct ifpga_port_hw *port, struct feature_prop *prop)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!port)\n \t\treturn -ENOENT;\n@@ -36,7 +36,7 @@ int port_set_prop(struct ifpga_port_hw *port, struct feature_prop *prop)\n \n int port_set_irq(struct ifpga_port_hw *port, u32 feature_id, void *irq_set)\n {\n-\tstruct feature *feature;\n+\tstruct ifpga_feature *feature;\n \n \tif (!port)\n \t\treturn -ENOENT;\n@@ -260,7 +260,7 @@ static int port_get_userclk_freqcntrsts(struct ifpga_port_hw *port, u64 *val)\n \treturn 0;\n }\n \n-static int port_hdr_init(struct feature *feature)\n+static int port_hdr_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -271,14 +271,15 @@ static int port_hdr_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void port_hdr_uinit(struct feature *feature)\n+static void port_hdr_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"port hdr uinit.\\n\");\n }\n \n-static int port_hdr_get_prop(struct feature *feature, struct feature_prop *prop)\n+static int port_hdr_get_prop(struct ifpga_feature *feature,\n+\t\tstruct feature_prop *prop)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -308,7 +309,8 @@ static int port_hdr_get_prop(struct feature *feature, struct feature_prop *prop)\n \treturn -ENOENT;\n }\n \n-static int port_hdr_set_prop(struct feature *feature, struct feature_prop *prop)\n+static int port_hdr_set_prop(struct ifpga_feature *feature,\n+\t\tstruct feature_prop *prop)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -326,14 +328,14 @@ static int port_hdr_set_prop(struct feature *feature, struct feature_prop *prop)\n \treturn -ENOENT;\n }\n \n-struct feature_ops ifpga_rawdev_port_hdr_ops = {\n+struct ifpga_feature_ops ifpga_rawdev_port_hdr_ops = {\n \t.init = port_hdr_init,\n \t.uinit = port_hdr_uinit,\n \t.get_prop = port_hdr_get_prop,\n \t.set_prop = port_hdr_set_prop,\n };\n \n-static int port_stp_init(struct feature *feature)\n+static int port_stp_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -347,19 +349,19 @@ static int port_stp_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void port_stp_uinit(struct feature *feature)\n+static void port_stp_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"port stp uinit.\\n\");\n }\n \n-struct feature_ops ifpga_rawdev_port_stp_ops = {\n+struct ifpga_feature_ops ifpga_rawdev_port_stp_ops = {\n \t.init = port_stp_init,\n \t.uinit = port_stp_uinit,\n };\n \n-static int port_uint_init(struct feature *feature)\n+static int port_uint_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -375,19 +377,19 @@ static int port_uint_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void port_uint_uinit(struct feature *feature)\n+static void port_uint_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"PORT UINT UInit.\\n\");\n }\n \n-struct feature_ops ifpga_rawdev_port_uint_ops = {\n+struct ifpga_feature_ops ifpga_rawdev_port_uint_ops = {\n \t.init = port_uint_init,\n \t.uinit = port_uint_uinit,\n };\n \n-static int port_afu_init(struct feature *feature)\n+static int port_afu_init(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n@@ -396,14 +398,14 @@ static int port_afu_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void port_afu_uinit(struct feature *feature)\n+static void port_afu_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n \n \tdev_info(NULL, \"PORT AFU UInit.\\n\");\n }\n \n-struct feature_ops ifpga_rawdev_port_afu_ops = {\n+struct ifpga_feature_ops ifpga_rawdev_port_afu_ops = {\n \t.init = port_afu_init,\n \t.uinit = port_afu_uinit,\n };\ndiff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c b/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c\nindex 9dd1cf5..138284e 100644\n--- a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c\n+++ b/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c\n@@ -84,7 +84,7 @@ static int port_err_set_clear(struct ifpga_port_hw *port, u64 val)\n \treturn ret;\n }\n \n-static int port_error_init(struct feature *feature)\n+static int port_error_init(struct ifpga_feature *feature)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n \n@@ -99,12 +99,12 @@ static int port_error_init(struct feature *feature)\n \treturn 0;\n }\n \n-static void port_error_uinit(struct feature *feature)\n+static void port_error_uinit(struct ifpga_feature *feature)\n {\n \tUNUSED(feature);\n }\n \n-static int port_error_get_prop(struct feature *feature,\n+static int port_error_get_prop(struct ifpga_feature *feature,\n \t\t\t       struct feature_prop *prop)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n@@ -125,7 +125,7 @@ static int port_error_get_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-static int port_error_set_prop(struct feature *feature,\n+static int port_error_set_prop(struct ifpga_feature *feature,\n \t\t\t       struct feature_prop *prop)\n {\n \tstruct ifpga_port_hw *port = feature->parent;\n@@ -136,7 +136,7 @@ static int port_error_set_prop(struct feature *feature,\n \treturn -ENOENT;\n }\n \n-struct feature_ops ifpga_rawdev_port_error_ops = {\n+struct ifpga_feature_ops ifpga_rawdev_port_error_ops = {\n \t.init = port_error_init,\n \t.uinit = port_error_uinit,\n \t.get_prop = port_error_get_prop,\n",
    "prefixes": [
        "v5",
        "13/14"
    ]
}