helper: debug: remove duplicate ODPH_UNUSED macro

ODP API already has ODP_UNUSED macro.

Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Petri Savolainen <petri.savolainen@nokia.com>

9 files changed, 15 insertions, 16 deletions

diff --git a/helper/include/odp/helper/odph_debug.h b/helper/include/odp/helper/odph_debug.h
index 04d839b1d..ef520497b 100644
--- a/helper/include/odp/helper/odph_debug.h
+++ b/helper/include/odp/helper/odph_debug.h
@@ -24,6 +24,10 @@
 extern "C" {
 #endif
 
+/** @addtogroup odph_debug ODPH DEBUG
+ *  @{
+ */
+
 /**
  * Assert macro for applications and helper code
  *
@@ -97,11 +101,6 @@ do { \
  * @}
  */
 
-/**
- * Mark intentionally unused argument for functions
- */
-#define ODPH_UNUSED     __attribute__((__unused__))
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/helper/lineartable.c b/helper/lineartable.c
index 8479d2f1a..864c7973f 100644
--- a/helper/lineartable.c
+++ b/helper/lineartable.c
@@ -43,7 +43,7 @@ typedef struct {
  */
 
 odph_table_t odph_linear_table_create(const char *name, uint32_t capacity,
-				      uint32_t un ODPH_UNUSED,
+				      uint32_t un ODP_UNUSED,
 				      uint32_t value_size)
 {
 	uint32_t idx;
@@ -181,7 +181,7 @@ static int odph_lineartable_put_value(odph_table_t table,
 /* should make sure the input table exists and is available */
 static int odph_lineartable_get_value(odph_table_t table,
 				      void *key, void *buffer,
-				      uint32_t buffer_size ODPH_UNUSED)
+				      uint32_t buffer_size ODP_UNUSED)
 {
 	odph_linear_table_imp *tbl;
 	uint32_t ikey = 0;
diff --git a/helper/test/chksum.c b/helper/test/chksum.c
index 9fa4ec18a..a569f2394 100644
--- a/helper/test/chksum.c
+++ b/helper/test/chksum.c
@@ -20,7 +20,7 @@ struct udata_struct {
 };
 
 /* Create additional dataplane threads */
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odp_instance_t instance;
 	int status = 0;
diff --git a/helper/test/cuckootable.c b/helper/test/cuckootable.c
index ee5f1d832..22df27f3d 100644
--- a/helper/test/cuckootable.c
+++ b/helper/test/cuckootable.c
@@ -542,7 +542,7 @@ test_cuckoo_hash_table(void)
 	return 0;
 }
 
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odp_instance_t instance;
 	int ret = 0;
diff --git a/helper/test/iplookuptable.c b/helper/test/iplookuptable.c
index 6637242d8..8ffc75efe 100644
--- a/helper/test/iplookuptable.c
+++ b/helper/test/iplookuptable.c
@@ -138,7 +138,7 @@ static int test_ip_lookup_table(void)
 	return 0;
 }
 
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odp_instance_t instance;
 	int ret = 0;
diff --git a/helper/test/linux/process.c b/helper/test/linux/process.c
index 26c9649d6..0bc53e5a7 100644
--- a/helper/test/linux/process.c
+++ b/helper/test/linux/process.c
@@ -15,7 +15,7 @@
 
 #define NUMBER_WORKERS 16 /* 0 = max */
 
-static void *worker_fn(void *arg ODPH_UNUSED)
+static void *worker_fn(void *arg ODP_UNUSED)
 {
 	/* depend on the odp helper to call odp_init_local */
 	printf("Worker thread on CPU %d\n", odp_cpu_id());
@@ -24,7 +24,7 @@ static void *worker_fn(void *arg ODPH_UNUSED)
 }
 
 /* Create additional dataplane processes */
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odp_cpumask_t cpu_mask;
 	int num_workers;
diff --git a/helper/test/linux/pthread.c b/helper/test/linux/pthread.c
index b0a578151..e14d5cdf8 100644
--- a/helper/test/linux/pthread.c
+++ b/helper/test/linux/pthread.c
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #define NUMBER_WORKERS 16
-static void *worker_fn(void *arg ODPH_UNUSED)
+static void *worker_fn(void *arg ODP_UNUSED)
 {
 	/* depend on the odp helper to call odp_init_local */
 
@@ -25,7 +25,7 @@ static void *worker_fn(void *arg ODPH_UNUSED)
 }
 
 /* Create additional dataplane threads */
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odph_linux_pthread_t thread_tbl[NUMBER_WORKERS];
 	odp_cpumask_t cpu_mask;
diff --git a/helper/test/odpthreads.c b/helper/test/odpthreads.c
index dbff4294e..83f9476fd 100644
--- a/helper/test/odpthreads.c
+++ b/helper/test/odpthreads.c
@@ -26,7 +26,7 @@ static void main_exit(void);
 /* ODP application instance */
 static odp_instance_t odp_instance;
 
-static int worker_fn(void *arg ODPH_UNUSED)
+static int worker_fn(void *arg ODP_UNUSED)
 {
 	int cpu;
 	odp_cpumask_t workers;
diff --git a/helper/test/table.c b/helper/test/table.c
index 2887bd599..1a889392c 100644
--- a/helper/test/table.c
+++ b/helper/test/table.c
@@ -25,7 +25,7 @@
  * value (data): MAC address of the next hop station (6 bytes).
  */
 
-int main(int argc ODPH_UNUSED, char *argv[] ODPH_UNUSED)
+int main(int argc ODP_UNUSED, char *argv[] ODP_UNUSED)
 {
 	odp_instance_t instance;
 	int ret = 0;