Remove unused symbols (exposed only in an internal header which
guarantees that no application out there relied on them).
Remove rte_ prefix and inline the rest to avoid having to expose them as
global symbols for a relatively small added value.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
drivers/bus/ifpga/ifpga_bus.c | 13 +++--
drivers/bus/ifpga/ifpga_common.c | 87 --------------------------------
drivers/bus/ifpga/ifpga_common.h | 54 ++++++++++++++++----
drivers/bus/ifpga/meson.build | 2 +-
drivers/bus/ifpga/version.map | 2 -
drivers/raw/ifpga/ifpga_rawdev.c | 2 +-
6 files changed, 53 insertions(+), 107 deletions(-)
delete mode 100644 drivers/bus/ifpga/ifpga_common.c
diff --git a/drivers/bus/ifpga/ifpga_bus.c b/drivers/bus/ifpga/ifpga_bus.c
index d962fb8362..988e336a1b 100644
--- a/drivers/bus/ifpga/ifpga_bus.c
+++ b/drivers/bus/ifpga/ifpga_bus.c
@@ -117,9 +117,9 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
if (rte_kvargs_count(kvlist, IFPGA_ARG_PORT) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT,
- &rte_ifpga_get_integer32_arg, &afu_pr_conf.afu_id.port) < 0) {
- IFPGA_BUS_ERR("error to parse %s",
- IFPGA_ARG_PORT);
+ ifpga_get_integer32_arg,
+ &afu_pr_conf.afu_id.port) < 0) {
+ IFPGA_BUS_ERR("error to parse %s", IFPGA_ARG_PORT);
goto end;
}
} else {
@@ -130,9 +130,8 @@ ifpga_scan_one(struct rte_rawdev *rawdev,
if (rte_kvargs_count(kvlist, IFPGA_AFU_BTS) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_AFU_BTS,
- &rte_ifpga_get_string_arg, &path) < 0) {
- IFPGA_BUS_ERR("Failed to parse %s",
- IFPGA_AFU_BTS);
+ ifpga_get_string_arg, &path) < 0) {
+ IFPGA_BUS_ERR("Failed to parse %s", IFPGA_AFU_BTS);
goto end;
}
afu_pr_conf.pr_enable = 1;
@@ -228,7 +227,7 @@ ifpga_scan(void)
if (rte_kvargs_count(kvlist, IFPGA_ARG_NAME) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_ARG_NAME,
- &rte_ifpga_get_string_arg, &name) < 0) {
+ ifpga_get_string_arg, &name) < 0) {
IFPGA_BUS_ERR("error to parse %s",
IFPGA_ARG_NAME);
goto end;
diff --git a/drivers/bus/ifpga/ifpga_common.c b/drivers/bus/ifpga/ifpga_common.c
deleted file mode 100644
index 223660d6ff..0000000000
--- a/drivers/bus/ifpga/ifpga_common.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation
- */
-
-#include <string.h>
-#include <inttypes.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <sys/queue.h>
-#include <sys/mman.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <fcntl.h>
-
-#include <rte_errno.h>
-#include <rte_per_lcore.h>
-#include <rte_memory.h>
-#include <rte_memzone.h>
-#include <rte_eal.h>
-#include <rte_common.h>
-
-#include <rte_devargs.h>
-#include <rte_kvargs.h>
-#include <rte_alarm.h>
-
-#include "rte_bus_ifpga.h"
-#include "ifpga_logs.h"
-#include "ifpga_common.h"
-
-int rte_ifpga_get_string_arg(const char *key __rte_unused,
- const char *value, void *extra_args)
-{
- if (!value || !extra_args)
- return -EINVAL;
-
- *(char **)extra_args = strdup(value);
-
- if (!*(char **)extra_args)
- return -ENOMEM;
-
- return 0;
-}
-int rte_ifpga_get_integer32_arg(const char *key __rte_unused,
- const char *value, void *extra_args)
-{
- if (!value || !extra_args)
- return -EINVAL;
-
- *(int *)extra_args = strtoull(value, NULL, 0);
-
- return 0;
-}
-int ifpga_get_integer64_arg(const char *key __rte_unused,
- const char *value, void *extra_args)
-{
- if (!value || !extra_args)
- return -EINVAL;
-
- *(uint64_t *)extra_args = strtoull(value, NULL, 0);
-
- return 0;
-}
-int ifpga_get_unsigned_long(const char *str, int base)
-{
- unsigned long num;
- char *end = NULL;
-
- errno = 0;
-
- num = strtoul(str, &end, base);
- if ((str[0] == '\0') || (end == NULL) || (*end != '\0') || (errno != 0))
- return -1;
-
- return num;
-}
-
-int ifpga_afu_id_cmp(const struct rte_afu_id *afu_id0,
- const struct rte_afu_id *afu_id1)
-{
- if ((afu_id0->uuid.uuid_low == afu_id1->uuid.uuid_low) &&
- (afu_id0->uuid.uuid_high == afu_id1->uuid.uuid_high) &&
- (afu_id0->port == afu_id1->port)) {
- return 0;
- } else
- return 1;
-}
diff --git a/drivers/bus/ifpga/ifpga_common.h b/drivers/bus/ifpga/ifpga_common.h
index f9254b9d5d..bb6524030f 100644
--- a/drivers/bus/ifpga/ifpga_common.h
+++ b/drivers/bus/ifpga/ifpga_common.h
@@ -5,14 +5,50 @@
#ifndef _IFPGA_COMMON_H_
#define _IFPGA_COMMON_H_
-int rte_ifpga_get_string_arg(const char *key __rte_unused,
- const char *value, void *extra_args);
-int rte_ifpga_get_integer32_arg(const char *key __rte_unused,
- const char *value, void *extra_args);
-int ifpga_get_integer64_arg(const char *key __rte_unused,
- const char *value, void *extra_args);
-int ifpga_get_unsigned_long(const char *str, int base);
-int ifpga_afu_id_cmp(const struct rte_afu_id *afu_id0,
- const struct rte_afu_id *afu_id1);
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <rte_bus_ifpga.h>
+#include <rte_common.h>
+
+static inline int
+ifpga_get_string_arg(const char *key __rte_unused, const char *value,
+ void *extra_args)
+{
+ if (!value || !extra_args)
+ return -EINVAL;
+
+ *(char **)extra_args = strdup(value);
+
+ if (!*(char **)extra_args)
+ return -ENOMEM;
+
+ return 0;
+}
+
+static inline int
+ifpga_get_integer32_arg(const char *key __rte_unused, const char *value,
+ void *extra_args)
+{
+ if (!value || !extra_args)
+ return -EINVAL;
+
+ *(int *)extra_args = strtoull(value, NULL, 0);
+
+ return 0;
+}
+
+static inline int
+ifpga_afu_id_cmp(const struct rte_afu_id *afu_id0,
+ const struct rte_afu_id *afu_id1)
+{
+ if ((afu_id0->uuid.uuid_low == afu_id1->uuid.uuid_low) &&
+ (afu_id0->uuid.uuid_high == afu_id1->uuid.uuid_high) &&
+ (afu_id0->port == afu_id1->port)) {
+ return 0;
+ } else
+ return 1;
+}
#endif /* _IFPGA_COMMON_H_ */
diff --git a/drivers/bus/ifpga/meson.build b/drivers/bus/ifpga/meson.build
index cc5047e3ce..9d56a4bb2b 100644
--- a/drivers/bus/ifpga/meson.build
+++ b/drivers/bus/ifpga/meson.build
@@ -9,4 +9,4 @@ endif
deps += ['pci', 'kvargs', 'rawdev']
headers = files('rte_bus_ifpga.h')
-sources = files('ifpga_common.c', 'ifpga_bus.c')
+sources = files('ifpga_bus.c')
diff --git a/drivers/bus/ifpga/version.map b/drivers/bus/ifpga/version.map
index 8ac3a4d258..c33537d39d 100644
--- a/drivers/bus/ifpga/version.map
+++ b/drivers/bus/ifpga/version.map
@@ -4,8 +4,6 @@ DPDK_22 {
rte_ifpga_driver_register;
rte_ifpga_driver_unregister;
rte_ifpga_find_afu_by_name;
- rte_ifpga_get_integer32_arg;
- rte_ifpga_get_string_arg;
local: *;
};
diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
index 78a7123528..93a7e74959 100644
--- a/drivers/raw/ifpga/ifpga_rawdev.c
+++ b/drivers/raw/ifpga/ifpga_rawdev.c
@@ -1752,7 +1752,7 @@ ifpga_vdev_parse_devargs(struct rte_devargs *devargs,
if (rte_kvargs_count(kvlist, IFPGA_ARG_PORT) == 1) {
if (rte_kvargs_process(kvlist, IFPGA_ARG_PORT,
- &rte_ifpga_get_integer32_arg, &port) < 0) {
+ ifpga_get_integer32_arg, &port) < 0) {
IFPGA_RAWDEV_PMD_ERR("error to parse %s",
IFPGA_ARG_PORT);
goto end;
--
2.36.1
