diff --git a/arch/riscv/core/prep_c.c b/arch/riscv/core/prep_c.c
index cc6cb85f1c0..ca003a692f8 100644
--- a/arch/riscv/core/prep_c.c
+++ b/arch/riscv/core/prep_c.c
@@ -25,8 +25,6 @@
  * @brief Prepare to and run C code
  *
  * This routine prepares for the execution of and runs C code.
- *
- * @return N/A
  */
 
 void _PrepC(void)
diff --git a/arch/riscv/core/reboot.c b/arch/riscv/core/reboot.c
index 1c3cf18c52a..879a0d509c9 100644
--- a/arch/riscv/core/reboot.c
+++ b/arch/riscv/core/reboot.c
@@ -19,8 +19,6 @@
  * This is stub function to avoid build error with CONFIG_REBOOT=y
  * RISC-V specification does not have a common interface for system reset.
  * Each RISC-V SoC that has reset feature should implement own reset function.
- *
- * @return N/A
  */
 
 void __weak sys_arch_reboot(int type)
diff --git a/soc/riscv/esp32c3/idle.c b/soc/riscv/esp32c3/idle.c
index 38feb526201..1109a827445 100644
--- a/soc/riscv/esp32c3/idle.c
+++ b/soc/riscv/esp32c3/idle.c
@@ -9,14 +9,11 @@
 #include <arch/cpu.h>
 
 /**
- *
  * @brief Power save idle routine
  *
  * This function will be called by the kernel idle loop or possibly within
  * an implementation of _pm_save_idle in the kernel when the
  * '_pm_save_flag' variable is non-zero.
- *
- * @return N/A
  */
 void arch_cpu_idle(void)
 {
diff --git a/soc/riscv/riscv-privilege/common/idle.c b/soc/riscv/riscv-privilege/common/idle.c
index d14bac3fed0..04b0c6ddfa1 100644
--- a/soc/riscv/riscv-privilege/common/idle.c
+++ b/soc/riscv/riscv-privilege/common/idle.c
@@ -22,14 +22,11 @@ static ALWAYS_INLINE void riscv_idle(unsigned int key)
 }
 
 /**
- *
  * @brief Power save idle routine
  *
  * This function will be called by the kernel idle loop or possibly within
  * an implementation of _pm_save_idle in the kernel when the
  * '_pm_save_flag' variable is non-zero.
- *
- * @return N/A
  */
 void arch_cpu_idle(void)
 {
@@ -37,7 +34,6 @@ void arch_cpu_idle(void)
 }
 
 /**
- *
  * @brief Atomically re-enable interrupts and enter low power mode
  *
  * INTERNAL
@@ -50,8 +46,6 @@ void arch_cpu_idle(void)
  *
  * 2) After waking up from the low-power mode, the interrupt lockout state
  *    must be restored as indicated in the 'imask' input parameter.
- *
- * @return N/A
  */
 void arch_cpu_atomic_idle(unsigned int key)
 {