diff options
Diffstat (limited to 'drivers/raw/ifpga_rawdev')
| -rw-r--r-- | drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c | 8 | ||||
| -rw-r--r-- | drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h | 8 | ||||
| -rw-r--r-- | drivers/raw/ifpga_rawdev/base/ifpga_port.c | 6 | ||||
| -rw-r--r-- | drivers/raw/ifpga_rawdev/base/ifpga_port_error.c | 2 | ||||
| -rw-r--r-- | drivers/raw/ifpga_rawdev/base/meson.build | 4 | ||||
| -rw-r--r-- | drivers/raw/ifpga_rawdev/ifpga_rawdev.c | 5 |
6 files changed, 17 insertions, 16 deletions
diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c b/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c index f0939dc3..848e5183 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c +++ b/drivers/raw/ifpga_rawdev/base/ifpga_enumerate.c @@ -104,14 +104,14 @@ static struct feature_info port_features[] = { .resource_size = sizeof(struct feature_port_header), .feature_index = PORT_FEATURE_ID_HEADER, .revision_id = PORT_HEADER_REVISION, - .ops = &port_hdr_ops, + .ops = &ifpga_rawdev_port_hdr_ops, }, { .name = PORT_FEATURE_ERR, .resource_size = sizeof(struct feature_port_error), .feature_index = PORT_FEATURE_ID_ERROR, .revision_id = PORT_ERR_REVISION, - .ops = &port_error_ops, + .ops = &ifpga_rawdev_port_error_ops, }, { .name = PORT_FEATURE_UMSG, @@ -124,14 +124,14 @@ static struct feature_info port_features[] = { .resource_size = sizeof(struct feature_port_uint), .feature_index = PORT_FEATURE_ID_UINT, .revision_id = PORT_UINT_REVISION, - .ops = &port_uint_ops, + .ops = &ifpga_rawdev_port_uint_ops, }, { .name = PORT_FEATURE_STP, .resource_size = PORT_FEATURE_STP_REGION_SIZE, .feature_index = PORT_FEATURE_ID_STP, .revision_id = PORT_STP_REVISION, - .ops = &port_stp_ops, + .ops = &ifpga_rawdev_port_stp_ops, }, { .name = PORT_FEATURE_UAFU, diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h index 7a39a580..4391f2fd 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h +++ b/drivers/raw/ifpga_rawdev/base/ifpga_feature_dev.h @@ -156,10 +156,10 @@ struct fpga_uafu_irq_set { int port_set_irq(struct ifpga_port_hw *port, u32 feature_id, void *irq_set); -extern struct feature_ops port_hdr_ops; -extern struct feature_ops port_error_ops; -extern struct feature_ops port_stp_ops; -extern struct feature_ops port_uint_ops; +extern struct feature_ops ifpga_rawdev_port_hdr_ops; +extern struct feature_ops ifpga_rawdev_port_error_ops; +extern struct feature_ops ifpga_rawdev_port_stp_ops; +extern struct feature_ops ifpga_rawdev_port_uint_ops; /* help functions for feature ops */ int fpga_msix_set_block(struct feature *feature, unsigned int start, diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port.c b/drivers/raw/ifpga_rawdev/base/ifpga_port.c index a962f5b4..8b5668d4 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_port.c +++ b/drivers/raw/ifpga_rawdev/base/ifpga_port.c @@ -326,7 +326,7 @@ static int port_hdr_set_prop(struct feature *feature, struct feature_prop *prop) return -ENOENT; } -struct feature_ops port_hdr_ops = { +struct feature_ops ifpga_rawdev_port_hdr_ops = { .init = port_hdr_init, .uinit = port_hdr_uinit, .get_prop = port_hdr_get_prop, @@ -354,7 +354,7 @@ static void port_stp_uinit(struct feature *feature) dev_info(NULL, "port stp uinit.\n"); } -struct feature_ops port_stp_ops = { +struct feature_ops ifpga_rawdev_port_stp_ops = { .init = port_stp_init, .uinit = port_stp_uinit, }; @@ -382,7 +382,7 @@ static void port_uint_uinit(struct feature *feature) dev_info(NULL, "PORT UINT UInit.\n"); } -struct feature_ops port_uint_ops = { +struct feature_ops ifpga_rawdev_port_uint_ops = { .init = port_uint_init, .uinit = port_uint_uinit, }; diff --git a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c b/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c index 23db562b..9dd1cf59 100644 --- a/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c +++ b/drivers/raw/ifpga_rawdev/base/ifpga_port_error.c @@ -136,7 +136,7 @@ static int port_error_set_prop(struct feature *feature, return -ENOENT; } -struct feature_ops port_error_ops = { +struct feature_ops ifpga_rawdev_port_error_ops = { .init = port_error_init, .uinit = port_error_uinit, .get_prop = port_error_get_prop, diff --git a/drivers/raw/ifpga_rawdev/base/meson.build b/drivers/raw/ifpga_rawdev/base/meson.build index cb655352..03f5112c 100644 --- a/drivers/raw/ifpga_rawdev/base/meson.build +++ b/drivers/raw/ifpga_rawdev/base/meson.build @@ -18,8 +18,8 @@ sources = [ ] error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', - '-Wno-format', '-Wno-unused-but-set-variable', - '-Wno-strict-aliasing' + '-Wno-format', '-Wno-error=format-security', + '-Wno-strict-aliasing', '-Wno-unused-but-set-variable' ] c_args = cflags foreach flag: error_cflags diff --git a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c index 3fed0578..32e318fc 100644 --- a/drivers/raw/ifpga_rawdev/ifpga_rawdev.c +++ b/drivers/raw/ifpga_rawdev/ifpga_rawdev.c @@ -542,6 +542,7 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) int port; char *name = NULL; char dev_name[RTE_RAWDEV_NAME_MAX_LEN]; + int ret = -1; devargs = dev->device.devargs; @@ -583,7 +584,7 @@ ifpga_cfg_probe(struct rte_vdev_device *dev) snprintf(dev_name, RTE_RAWDEV_NAME_MAX_LEN, "%d|%s", port, name); - rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME), + ret = rte_eal_hotplug_add(RTE_STR(IFPGA_BUS_NAME), dev_name, devargs->args); end: if (kvlist) @@ -591,7 +592,7 @@ end: if (name) free(name); - return 0; + return ret; } static int |