From 8f7f62869a3ba2c8f3b539682b86d0ef2255e608 Mon Sep 17 00:00:00 2001
From: Daniel Leung <daniel.leung@intel.com>
Date: Thu, 6 Jan 2022 17:22:25 -0800
Subject: [PATCH] tests: remove @return doc for void functions

For functions returning nothing, there is no need to document
with @return, as Doxgen complains about "documented empty
return type of ...".

Signed-off-by: Daniel Leung <daniel.leung@intel.com>
---
 .../arm/arm_irq_vector_table/src/arm_irq_vector_table.c   | 3 ---
 tests/arch/x86/static_idt/src/main.c                      | 3 ---
 tests/benchmarks/app_kernel/src/fifo_b.c                  | 1 -
 tests/benchmarks/app_kernel/src/fifo_r.c                  | 1 -
 tests/benchmarks/app_kernel/src/mailbox_b.c               | 2 --
 tests/benchmarks/app_kernel/src/mailbox_r.c               | 1 -
 tests/benchmarks/app_kernel/src/master.c                  | 6 +-----
 tests/benchmarks/app_kernel/src/memmap_b.c                | 1 -
 tests/benchmarks/app_kernel/src/mutex_b.c                 | 1 -
 tests/benchmarks/app_kernel/src/pipe_b.c                  | 1 -
 tests/benchmarks/app_kernel/src/pipe_r.c                  | 1 -
 tests/benchmarks/app_kernel/src/receiver.c                | 1 -
 tests/benchmarks/app_kernel/src/sema_b.c                  | 1 -
 tests/benchmarks/app_kernel/src/sema_r.c                  | 1 -
 tests/benchmarks/latency_measure/src/coop_ctx_switch.c    | 1 -
 tests/benchmarks/latency_measure/src/int_to_thread.c      | 2 --
 tests/benchmarks/latency_measure/src/int_to_thread_evt.c  | 1 -
 .../benchmarks/latency_measure/src/thread_switch_yield.c  | 4 ----
 tests/benchmarks/sys_kernel/src/lifo.c                    | 4 ----
 tests/benchmarks/sys_kernel/src/mwfifo.c                  | 4 ----
 tests/benchmarks/sys_kernel/src/sema.c                    | 4 ----
 tests/benchmarks/sys_kernel/src/stack.c                   | 8 --------
 tests/benchmarks/sys_kernel/src/syskernel.c               | 4 ----
 tests/crypto/rand32/src/main.c                            | 2 --
 tests/kernel/context/src/main.c                           | 7 -------
 tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h | 3 ---
 .../kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h | 3 ---
 tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h | 3 ---
 .../kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h | 3 ---
 tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h | 3 ---
 tests/kernel/mem_protect/stackprot/src/main.c             | 3 ---
 tests/kernel/mem_slab/mslab/src/main.c                    | 3 ---
 tests/kernel/mutex/sys_mutex/src/main.c                   | 7 -------
 tests/kernel/mutex/sys_mutex/src/thread_12.c              | 1 -
 tests/kernel/workq/user_work/src/main.c                   | 2 --
 tests/lib/sprintf/src/main.c                              | 1 -
 36 files changed, 1 insertion(+), 96 deletions(-)

diff --git a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
index 45496d15393..3216647011f 100644
--- a/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
+++ b/tests/arch/arm/arm_irq_vector_table/src/arm_irq_vector_table.c
@@ -83,7 +83,6 @@ struct k_sem sem[3];
  *
  * @brief ISR for IRQ0
  *
- * @return N/A
  */
 
 void isr0(void)
@@ -97,7 +96,6 @@ void isr0(void)
  *
  * @brief ISR for IRQ1
  *
- * @return N/A
  */
 
 void isr1(void)
@@ -111,7 +109,6 @@ void isr1(void)
  *
  * @brief ISR for IRQ2
  *
- * @return N/A
  */
 
 void isr2(void)
diff --git a/tests/arch/x86/static_idt/src/main.c b/tests/arch/x86/static_idt/src/main.c
index c686e3bfca7..929f576f6db 100644
--- a/tests/arch/x86/static_idt/src/main.c
+++ b/tests/arch/x86/static_idt/src/main.c
@@ -63,8 +63,6 @@ void k_sys_fatal_error_handler(unsigned int reason, const z_arch_esf_t *esf)
  * Handler to perform various actions from within an ISR context
  *
  * This routine is the ISR handler for _trigger_isr_handler().
- *
- * @return N/A
  */
 
 void isr_handler(void)
@@ -89,7 +87,6 @@ void isr_handler(void)
  * done, then control goes back to the offending instruction and an infinite
  * loop of divide-by-zero errors would be created.)
  *
- * @return N/A
  */
 
 void exc_divide_error_handler(z_arch_esf_t *p_esf)
diff --git a/tests/benchmarks/app_kernel/src/fifo_b.c b/tests/benchmarks/app_kernel/src/fifo_b.c
index 347214c5325..b7e59b071d1 100644
--- a/tests/benchmarks/app_kernel/src/fifo_b.c
+++ b/tests/benchmarks/app_kernel/src/fifo_b.c
@@ -14,7 +14,6 @@
  *
  * @brief Queue transfer speed test
  *
- * @return N/A
  */
 void queue_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/fifo_r.c b/tests/benchmarks/app_kernel/src/fifo_r.c
index b0aaffd61b7..1580ef114ca 100644
--- a/tests/benchmarks/app_kernel/src/fifo_r.c
+++ b/tests/benchmarks/app_kernel/src/fifo_r.c
@@ -16,7 +16,6 @@
  *
  * @brief Data receive task
  *
- * @return N/A
  */
 void dequtask(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/mailbox_b.c b/tests/benchmarks/app_kernel/src/mailbox_b.c
index 9b1813eb530..907aa9b732a 100644
--- a/tests/benchmarks/app_kernel/src/mailbox_b.c
+++ b/tests/benchmarks/app_kernel/src/mailbox_b.c
@@ -71,7 +71,6 @@ void mailbox_put(uint32_t size, int count, uint32_t *time);
  *
  * @brief Mailbox transfer speed test
  *
- * @return N/A
  */
 void mailbox_test(void)
 {
@@ -125,7 +124,6 @@ void mailbox_test(void)
  * @param count   Number of data chunks.
  * @param time    The total time.
  *
- * @return N/A
  */
 void mailbox_put(uint32_t size, int count, uint32_t *time)
 {
diff --git a/tests/benchmarks/app_kernel/src/mailbox_r.c b/tests/benchmarks/app_kernel/src/mailbox_r.c
index cfb0ae502c2..f0b5e9f87bf 100644
--- a/tests/benchmarks/app_kernel/src/mailbox_r.c
+++ b/tests/benchmarks/app_kernel/src/mailbox_r.c
@@ -29,7 +29,6 @@ void mailbox_get(struct k_mbox *mailbox,
  *
  * @brief Receive task
  *
- * @return N/A
  */
 void mailrecvtask(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/master.c b/tests/benchmarks/app_kernel/src/master.c
index 735a93ea9b0..28a8df6d089 100644
--- a/tests/benchmarks/app_kernel/src/master.c
+++ b/tests/benchmarks/app_kernel/src/master.c
@@ -77,10 +77,9 @@ int kbhit(void)
  *
  * @brief Prepares the test output
  *
- * @return N/A
- *
  * @param continuously   Run test till the user presses the key.
  * @param autorun        Expect user input.
+ *
  */
 void init_output(int *continuously, int *autorun)
 {
@@ -97,7 +96,6 @@ void init_output(int *continuously, int *autorun)
  *
  * @brief Close output for the test
  *
- * @return N/A
  */
 void output_close(void)
 {
@@ -112,7 +110,6 @@ void output_close(void)
  * @brief Perform all selected benchmarks
  * see config.h to select or to unselect
  *
- * @return N/A
  */
 void main(void)
 {
@@ -154,7 +151,6 @@ void main(void)
  *
  * @brief Dummy test
  *
- * @return N/A
  */
 void dummy_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/memmap_b.c b/tests/benchmarks/app_kernel/src/memmap_b.c
index 37bc887c4f0..8e6872872a7 100644
--- a/tests/benchmarks/app_kernel/src/memmap_b.c
+++ b/tests/benchmarks/app_kernel/src/memmap_b.c
@@ -16,7 +16,6 @@
  *
  * @brief Memory map get/free test
  *
- * @return N/A
  */
 void memorymap_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/mutex_b.c b/tests/benchmarks/app_kernel/src/mutex_b.c
index 7c18e47eae2..cc3388bbcfd 100644
--- a/tests/benchmarks/app_kernel/src/mutex_b.c
+++ b/tests/benchmarks/app_kernel/src/mutex_b.c
@@ -14,7 +14,6 @@
  *
  * @brief Mutex lock/unlock test
  *
- * @return N/A
  */
 void mutex_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/pipe_b.c b/tests/benchmarks/app_kernel/src/pipe_b.c
index 6a7464658ff..5e0fd8fd206 100644
--- a/tests/benchmarks/app_kernel/src/pipe_b.c
+++ b/tests/benchmarks/app_kernel/src/pipe_b.c
@@ -91,7 +91,6 @@ int pipeput(struct k_pipe *pipe, enum pipe_options
  *
  * @brief Test the pipes transfer speed
  *
- * @return N/A
  */
 void pipe_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/pipe_r.c b/tests/benchmarks/app_kernel/src/pipe_r.c
index 5b47c5497c5..16ba2c0559c 100644
--- a/tests/benchmarks/app_kernel/src/pipe_r.c
+++ b/tests/benchmarks/app_kernel/src/pipe_r.c
@@ -28,7 +28,6 @@ int pipeget(struct k_pipe *pipe, enum pipe_options option,
  *
  * @brief Receive task
  *
- * @return N/A
  */
 void piperecvtask(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/receiver.c b/tests/benchmarks/app_kernel/src/receiver.c
index 71a1d7bfe1c..cd8d8964a36 100644
--- a/tests/benchmarks/app_kernel/src/receiver.c
+++ b/tests/benchmarks/app_kernel/src/receiver.c
@@ -28,7 +28,6 @@ void piperecvtask(void);
  *
  * @brief Main function of the task that receives data in the test
  *
- * @return N/A
  */
 void recvtask(void *p1, void *p2, void *p3)
 {
diff --git a/tests/benchmarks/app_kernel/src/sema_b.c b/tests/benchmarks/app_kernel/src/sema_b.c
index 8ec0643050f..1f0c1666db7 100644
--- a/tests/benchmarks/app_kernel/src/sema_b.c
+++ b/tests/benchmarks/app_kernel/src/sema_b.c
@@ -15,7 +15,6 @@
  *
  * @brief Semaphore signal speed test
  *
- * @return N/A
  */
 void sema_test(void)
 {
diff --git a/tests/benchmarks/app_kernel/src/sema_r.c b/tests/benchmarks/app_kernel/src/sema_r.c
index 3abe9830248..21f16e0eed0 100644
--- a/tests/benchmarks/app_kernel/src/sema_r.c
+++ b/tests/benchmarks/app_kernel/src/sema_r.c
@@ -17,7 +17,6 @@
  *
  * @brief Receive task (Wait task)
  *
- * @return N/A
  */
 void waittask(void)
 {
diff --git a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
index 34287c30a09..1bd0ccc7356 100644
--- a/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
+++ b/tests/benchmarks/latency_measure/src/coop_ctx_switch.c
@@ -50,7 +50,6 @@ K_SEM_DEFINE(sync_sema, 0, 1);
  * Fiber makes all the test preparations: registers the interrupt handler,
  * gets the first timestamp and invokes the software interrupt.
  *
- * @return N/A
  */
 static void thread_one(void)
 {
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread.c b/tests/benchmarks/latency_measure/src/int_to_thread.c
index 822624f25b1..66ace001945 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread.c
@@ -30,7 +30,6 @@ static timing_t timestamp_end;
  *
  * The interrupt handler gets the second timestamp.
  *
- * @return N/A
  */
 static void latency_test_isr(const void *unused)
 {
@@ -47,7 +46,6 @@ static void latency_test_isr(const void *unused)
  * Function makes all the test preparations: registers the interrupt handler,
  * gets the first timestamp and invokes the software interrupt.
  *
- * @return N/A
  */
 static void make_int(void)
 {
diff --git a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
index 5d311589b2c..cc159f8949b 100644
--- a/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
+++ b/tests/benchmarks/latency_measure/src/int_to_thread_evt.c
@@ -33,7 +33,6 @@ K_SEM_DEFINE(WORKSEMA, 0, 1);
  *
  * The interrupt handler gets the second timestamp.
  *
- * @return N/A
  */
 static void latency_test_isr(const void *unused)
 {
diff --git a/tests/benchmarks/latency_measure/src/thread_switch_yield.c b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
index b70ce60917f..014bcd0a2e5 100644
--- a/tests/benchmarks/latency_measure/src/thread_switch_yield.c
+++ b/tests/benchmarks/latency_measure/src/thread_switch_yield.c
@@ -30,8 +30,6 @@ static struct k_thread y_thread;
 
 /**
  * @brief Helper thread for measuring thread switch latency using yield
- *
- * @return N/A
  */
 void yielding_thread(void *arg1, void *arg2, void *arg3)
 {
@@ -43,8 +41,6 @@ void yielding_thread(void *arg1, void *arg2, void *arg3)
 
 /**
  * @brief Entry point for thread context switch using yield test
- *
- * @return N/A
  */
 void thread_switch_yield(void)
 {
diff --git a/tests/benchmarks/sys_kernel/src/lifo.c b/tests/benchmarks/sys_kernel/src/lifo.c
index 1489bbd0f82..1695fca202a 100644
--- a/tests/benchmarks/sys_kernel/src/lifo.c
+++ b/tests/benchmarks/sys_kernel/src/lifo.c
@@ -17,7 +17,6 @@ static struct k_fifo sync_fifo; /* for synchronization */
  *
  * @brief Initialize LIFOs for the test
  *
- * @return N/A
  */
 void lifo_test_init(void)
 {
@@ -34,7 +33,6 @@ void lifo_test_init(void)
  * @param par2   Number of test loops.
  * @param par3	 unused
  *
- * @return N/A
  */
 void lifo_thread1(void *par1, void *par2, void *par3)
 {
@@ -73,7 +71,6 @@ void lifo_thread1(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3   unused
  *
- * @return N/A
  */
 void lifo_thread2(void *par1, void *par2, void *par3)
 {
@@ -104,7 +101,6 @@ void lifo_thread2(void *par1, void *par2, void *par3)
  * @param par2   Number of test loops.
  * @param par3   unused
  *
- * @return N/A
  */
 void lifo_thread3(void *par1, void *par2, void *par3)
 {
diff --git a/tests/benchmarks/sys_kernel/src/mwfifo.c b/tests/benchmarks/sys_kernel/src/mwfifo.c
index a8b573c1879..9dcbf7abf5a 100644
--- a/tests/benchmarks/sys_kernel/src/mwfifo.c
+++ b/tests/benchmarks/sys_kernel/src/mwfifo.c
@@ -19,7 +19,6 @@ static struct k_fifo sync_fifo; /* for synchronization */
  *
  * @brief Initialize FIFOs for the test
  *
- * @return N/A
  */
 void fifo_test_init(void)
 {
@@ -36,7 +35,6 @@ void fifo_test_init(void)
  * @param par2   Number of test loops.
  * @param par3	 unused
  *
- * @return N/A
  */
 void fifo_thread1(void *par1, void *par2, void *par3)
 {
@@ -68,7 +66,6 @@ void fifo_thread1(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3   unused
  *
- * @return N/A
  */
 void fifo_thread2(void *par1, void *par2, void *par3)
 {
@@ -102,7 +99,6 @@ void fifo_thread2(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3   unused
  *
- * @return N/A
  */
 void fifo_thread3(void *par1, void *par2, void *par3)
 {
diff --git a/tests/benchmarks/sys_kernel/src/sema.c b/tests/benchmarks/sys_kernel/src/sema.c
index bf5a1979323..e6d08735c30 100644
--- a/tests/benchmarks/sys_kernel/src/sema.c
+++ b/tests/benchmarks/sys_kernel/src/sema.c
@@ -15,7 +15,6 @@ struct k_sem sem2;
  *
  * @brief Initialize semaphores for the test
  *
- * @return N/A
  */
 void sema_test_init(void)
 {
@@ -32,7 +31,6 @@ void sema_test_init(void)
  * @param par2   Number of test loops.
  * @param par3   Unused
  *
- * @return N/A
  */
 void sema_thread1(void *par1, void *par2, void *par3)
 {
@@ -57,7 +55,6 @@ void sema_thread1(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3   Unused
  *
- * @return N/A
  */
 void sema_thread2(void *par1, void *par2, void *par3)
 {
@@ -82,7 +79,6 @@ void sema_thread2(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3   Unused
  *
- * @return N/A
  */
 void sema_thread3(void *par1, void *par2, void *par3)
 {
diff --git a/tests/benchmarks/sys_kernel/src/stack.c b/tests/benchmarks/sys_kernel/src/stack.c
index 873f1883a5b..460dd5da278 100644
--- a/tests/benchmarks/sys_kernel/src/stack.c
+++ b/tests/benchmarks/sys_kernel/src/stack.c
@@ -18,8 +18,6 @@ stack_data_t stack2[2];
  *
  * @brief Initialize stacks for the test
  *
- * @return N/A
- *
  */
 void stack_test_init(void)
 {
@@ -36,8 +34,6 @@ void stack_test_init(void)
  * @param par2   Number of test loops.
  * @param par3	 Unused
  *
- * @return N/A
- *
  */
 void stack_thread1(void *par1, void *par2, void *par3)
 {
@@ -73,8 +69,6 @@ void stack_thread1(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3	 Unused
  *
- * @return N/A
- *
  */
 void stack_thread2(void *par1, void *par2, void *par3)
 {
@@ -105,8 +99,6 @@ void stack_thread2(void *par1, void *par2, void *par3)
  * @param par2   Number of test cycles.
  * @param par3	 Unused
  *
- * @return N/A
- *
  */
 void stack_thread3(void *par1, void *par2, void *par3)
 {
diff --git a/tests/benchmarks/sys_kernel/src/syskernel.c b/tests/benchmarks/sys_kernel/src/syskernel.c
index 1b6a44623d9..c111817b2cc 100644
--- a/tests/benchmarks/sys_kernel/src/syskernel.c
+++ b/tests/benchmarks/sys_kernel/src/syskernel.c
@@ -38,7 +38,6 @@ uint32_t number_of_loops;
  *
  * Routine does necessary preparations for the test to start
  *
- * @return N/A
  */
 void begin_test(void)
 {
@@ -94,7 +93,6 @@ int check_result(int i, uint32_t t)
  *
  * @param continuously   Run test till the user presses the key.
  *
- * @return N/A
  */
 
 void init_output(int *continuously)
@@ -112,7 +110,6 @@ void init_output(int *continuously)
  *
  * @brief Close output for the test
  *
- * @return N/A
  */
 void output_close(void)
 {
@@ -122,7 +119,6 @@ void output_close(void)
  *
  * @brief Perform all selected benchmarks
  *
- * @return N/A
  */
 void main(void)
 {
diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c
index b270f2d791e..54a796d901a 100644
--- a/tests/crypto/rand32/src/main.c
+++ b/tests/crypto/rand32/src/main.c
@@ -24,8 +24,6 @@
  *
  * @brief Regression test's entry point
  *
- *
- * @return N/A
  */
 
 void test_rand32(void)
diff --git a/tests/kernel/context/src/main.c b/tests/kernel/context/src/main.c
index 7d418762e24..21976dff740 100644
--- a/tests/kernel/context/src/main.c
+++ b/tests/kernel/context/src/main.c
@@ -219,8 +219,6 @@ static void test_kernel_cpu_idle_atomic(void);
  *
  * This routine is the ISR handler for isr_handler_trigger(). It performs
  * the command requested in <isr_info.command>.
- *
- * @return N/A
  */
 static void isr_handler(const void *data)
 {
@@ -285,8 +283,6 @@ int irq_lock_wrapper(int unused)
 
 /**
  * @brief A wrapper for irq_unlock()
- *
- * @return N/A
  */
 void irq_unlock_wrapper(int imask)
 {
@@ -306,8 +302,6 @@ int irq_disable_wrapper(int irq)
 
 /**
  * @brief A wrapper for irq_enable()
- *
- * @return N/A
  */
 void irq_enable_wrapper(int irq)
 {
@@ -760,7 +754,6 @@ static void _test_kernel_thread(k_tid_t _thread_id)
  * @param arg2    unused
  * @param arg3    unused
  *
- * @return N/A
  */
 
 static void thread_helper(void *arg1, void *arg2, void *arg3)
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
index cc921d1f58b..b4d91e3e84b 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arc_gcc.h
@@ -34,7 +34,6 @@
  * _load_all_float_registers() and _store_all_float_registers() agree
  * on the format.
  *
- * @return N/A
  */
 static inline void _load_all_float_registers(struct fp_register_set *regs)
 {
@@ -67,7 +66,6 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
  * _load_all_float_registers() occurred to load all the floating point
  * registers from a memory buffer.
  *
- * @return N/A
  */
 
 static inline void _store_all_float_registers(struct fp_register_set *regs)
@@ -102,7 +100,6 @@ static inline void _store_all_float_registers(struct fp_register_set *regs)
  * that pends and triggers a co-operative context switch to a low priority
  * thread.
  *
- * @return N/A
  */
 
 static inline void _load_then_store_all_float_registers(struct fp_register_set
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
index 0d7d3d4412c..a582d41fa05 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arm64_gcc.h
@@ -30,7 +30,6 @@
  * _load_all_float_registers() and _store_all_float_registers() agree
  * on the format.
  *
- * @return N/A
  */
 static inline void _load_all_float_registers(struct fp_register_set *regs)
 {
@@ -65,7 +64,6 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
  * _load_all_float_registers() occurred to load all the floating point
  * registers from a memory buffer.
  *
- * @return N/A
  */
 
 static inline void _store_all_float_registers(struct fp_register_set *regs)
@@ -104,7 +102,6 @@ static inline void _store_all_float_registers(struct fp_register_set *regs)
  * that pends and triggers a co-operative context switch to a low priority
  * thread.
  *
- * @return N/A
  */
 
 static inline void _load_then_store_all_float_registers(
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
index c52f83ee039..be0009e6640 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_arm_gcc.h
@@ -34,7 +34,6 @@
  * _load_all_float_registers() and _store_all_float_registers() agree
  * on the format.
  *
- * @return N/A
  */
 
 static inline void _load_all_float_registers(struct fp_register_set *regs)
@@ -55,7 +54,6 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
  * _load_all_float_registers() occurred to load all the floating point
  * registers from a memory buffer.
  *
- * @return N/A
  */
 
 static inline void _store_all_float_registers(struct fp_register_set *regs)
@@ -79,7 +77,6 @@ static inline void _store_all_float_registers(struct fp_register_set *regs)
  * that pends and triggers a co-operative context switch to a low priority
  * thread.
  *
- * @return N/A
  */
 
 static inline void _load_then_store_all_float_registers(struct fp_register_set
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
index 3b6651eafb0..758dccd7f12 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_riscv_gcc.h
@@ -44,7 +44,6 @@
  * _load_all_float_registers() and _store_all_float_registers() agree
  * on the format.
  *
- * @return N/A
  */
 static inline void _load_all_float_registers(struct fp_register_set *regs)
 {
@@ -129,7 +128,6 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
  * _load_all_float_registers() occurred to load all the floating point
  * registers from a memory buffer.
  *
- * @return N/A
  */
 
 static inline void _store_all_float_registers(struct fp_register_set *regs)
@@ -217,7 +215,6 @@ static inline void _store_all_float_registers(struct fp_register_set *regs)
  * that pends and triggers a co-operative context switch to a low priority
  * thread.
  *
- * @return N/A
  */
 
 static inline void _load_then_store_all_float_registers(struct fp_register_set
diff --git a/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h b/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
index 8ba46be8eb7..0795d173f61 100644
--- a/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
+++ b/tests/kernel/fpu_sharing/generic/src/float_regs_x86_gcc.h
@@ -34,7 +34,6 @@
  * _load_all_float_registers(), _store_all_float_registers() and
  * _load_then_store_all_float_registers() agree on the format.
  *
- * @return N/A
  */
 
 static inline void _load_all_float_registers(struct fp_register_set *regs)
@@ -78,7 +77,6 @@ static inline void _load_all_float_registers(struct fp_register_set *regs)
  * floating point operations was also co-operatively switched out and simply
  * inherits the existing x87 FPU state (expecting the stack to be empty).
  *
- * @return N/A
  */
 
 static inline void
@@ -128,7 +126,6 @@ _load_then_store_all_float_registers(struct fp_register_set *regs)
  * _load_all_float_registers() occurred to load all the floating point
  * registers from a memory buffer.
  *
- * @return N/A
  */
 
 static inline void _store_all_float_registers(struct fp_register_set *regs)
diff --git a/tests/kernel/mem_protect/stackprot/src/main.c b/tests/kernel/mem_protect/stackprot/src/main.c
index 0368c51178c..76ff766d54c 100644
--- a/tests/kernel/mem_protect/stackprot/src/main.c
+++ b/tests/kernel/mem_protect/stackprot/src/main.c
@@ -34,7 +34,6 @@ void check_input(const char *name, const char *input);
  *
  * @param name    caller identification string
  *
- * @return N/A
  */
 
 void print_loop(const char *name)
@@ -59,7 +58,6 @@ void print_loop(const char *name)
  * When stack protection feature is not enabled, the system crashes with
  * error like: Trying to execute code outside RAM or ROM.
  *
- * @return N/A
  */
 
 void check_input(const char *name, const char *input)
@@ -78,7 +76,6 @@ void check_input(const char *name, const char *input)
  * feature is enabled.  Hence it will not execute the print_loop function
  * and will not set ret to TC_FAIL.
  *
- * @return N/A
  */
 void alternate_thread(void)
 {
diff --git a/tests/kernel/mem_slab/mslab/src/main.c b/tests/kernel/mem_slab/mslab/src/main.c
index fff770addaa..15b492ecde0 100644
--- a/tests/kernel/mem_slab/mslab/src/main.c
+++ b/tests/kernel/mem_slab/mslab/src/main.c
@@ -54,7 +54,6 @@ K_MEM_SLAB_DEFINE(map_lgblks, 1024, NUMBLOCKS, 4);
  * SEM_REGRESDONE and SEM_HELPERDONE to synchronize between different parts
  * of the test.
  *
- * @return  N/A
  */
 
 void helper_thread(void)
@@ -122,7 +121,6 @@ void helper_thread(void)
  *
  * @param p    pointer to pointer of allocated blocks
  *
- * @return  TC_PASS, TC_FAIL
  */
 
 void test_slab_get_all_blocks(void **p)
@@ -165,7 +163,6 @@ void test_slab_get_all_blocks(void **p)
  *
  * @param p    pointer to pointer of allocated blocks
  *
- * @return  TC_PASS, TC_FAIL
  */
 
 void test_slab_free_all_blocks(void **p)
diff --git a/tests/kernel/mutex/sys_mutex/src/main.c b/tests/kernel/mutex/sys_mutex/src/main.c
index 0a4761519fb..18246414f6e 100644
--- a/tests/kernel/mutex/sys_mutex/src/main.c
+++ b/tests/kernel/mutex/sys_mutex/src/main.c
@@ -73,7 +73,6 @@ extern void test_mutex_multithread_competition(void);
  *
  * thread_05 -
  *
- * @return  N/A
  */
 
 void thread_05(void)
@@ -96,7 +95,6 @@ void thread_05(void)
  *
  * thread_06 -
  *
- * @return  N/A
  */
 
 void thread_06(void)
@@ -128,7 +126,6 @@ void thread_06(void)
  *
  * thread_07 -
  *
- * @return  N/A
  */
 
 void thread_07(void)
@@ -158,7 +155,6 @@ void thread_07(void)
  *
  * thread_08 -
  *
- * @return  N/A
  */
 
 void thread_08(void)
@@ -182,7 +178,6 @@ void thread_08(void)
  *
  * thread_09 -
  *
- * @return  N/A
  */
 
 void thread_09(void)
@@ -215,7 +210,6 @@ void thread_09(void)
  *
  * thread_11 -
  *
- * @return N/A
  */
 
 void thread_11(void)
@@ -243,7 +237,6 @@ extern void thread_12(void);
  * This thread will lock on mutex_1, mutex_2, mutex_3 and mutex_4. It later
  * recursively locks private_mutex, releases it, then re-locks it.
  *
- * @return  N/A
  */
 
 void test_mutex(void)
diff --git a/tests/kernel/mutex/sys_mutex/src/thread_12.c b/tests/kernel/mutex/sys_mutex/src/thread_12.c
index 184352acf5f..3257533be3f 100644
--- a/tests/kernel/mutex/sys_mutex/src/thread_12.c
+++ b/tests/kernel/mutex/sys_mutex/src/thread_12.c
@@ -27,7 +27,6 @@ extern struct sys_mutex private_mutex;
  *
  * thread_12 - thread that participates in recursive locking tests
  *
- * @return  N/A
  */
 
 void thread_12(void)
diff --git a/tests/kernel/workq/user_work/src/main.c b/tests/kernel/workq/user_work/src/main.c
index 72c50960e7c..c74970d6724 100644
--- a/tests/kernel/workq/user_work/src/main.c
+++ b/tests/kernel/workq/user_work/src/main.c
@@ -32,8 +32,6 @@ static struct k_thread *main_thread;
  *
  * @param unused of type k_work to make handler function accepted
  * by k_work_init
- *
- * @return N/A
  */
 static void common_work_handler(struct k_work_user *unused)
 {
diff --git a/tests/lib/sprintf/src/main.c b/tests/lib/sprintf/src/main.c
index 5a569bed65a..aaa1e7ceafa 100644
--- a/tests/lib/sprintf/src/main.c
+++ b/tests/lib/sprintf/src/main.c
@@ -943,7 +943,6 @@ void test_EOF(void)
  *
  * @brief Test entry point
  *
- * @return N/A
  */
 
 void test_main(void)