diff --git a/arch/arm/src/cxd56xx/cxd56_backuplog.c b/arch/arm/src/cxd56xx/cxd56_backuplog.c
index cc95479f8f8..983a77e6d71 100644
--- a/arch/arm/src/cxd56xx/cxd56_backuplog.c
+++ b/arch/arm/src/cxd56xx/cxd56_backuplog.c
@@ -303,8 +303,6 @@ void up_backuplog_free(const char *name)
     }
 
   leave_critical_section(flags);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c
index 5a8bffd4cc7..ae15e288f00 100644
--- a/arch/arm/src/cxd56xx/cxd56_cisif.c
+++ b/arch/arm/src/cxd56xx/cxd56_cisif.c
@@ -372,8 +372,6 @@ static void cisif_callback_for_intlev(uint8_t code)
   cisif_reg_write(CISIF_EXE_CMD, 1);
   cisif_reg_write(CISIF_YCC_DREAD_CONT, 0);
   cisif_reg_write(CISIF_JPG_DREAD_CONT, 0);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/cxd56xx/cxd56_cpupause.c b/arch/arm/src/cxd56xx/cxd56_cpupause.c
index 158b2c445be..e634b98850f 100644
--- a/arch/arm/src/cxd56xx/cxd56_cpupause.c
+++ b/arch/arm/src/cxd56xx/cxd56_cpupause.c
@@ -463,7 +463,6 @@ void up_send_irqreq(int idx, int irq, int cpu)
   /* Finally unlock the spinlock to proceed the handler */
 
   spin_unlock(&g_cpu_wait[cpu]);
-  return;
 }
 
 #endif /* CONFIG_SMP */
diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c
index 710a058c299..28ce3593270 100644
--- a/arch/arm/src/cxd56xx/cxd56_rtc.c
+++ b/arch/arm/src/cxd56xx/cxd56_rtc.c
@@ -318,8 +318,6 @@ static void cxd56_rtc_initialize(wdparm_t arg)
   /* Make it possible to use the RTC timer functions */
 
   g_rtc_enabled = true;
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/imxrt/imxrt_usbdev.c b/arch/arm/src/imxrt/imxrt_usbdev.c
index fc288a9657f..f59bce2d770 100644
--- a/arch/arm/src/imxrt/imxrt_usbdev.c
+++ b/arch/arm/src/imxrt/imxrt_usbdev.c
@@ -2923,8 +2923,6 @@ void arm_usbinitialize(void)
   /* Reset/Re-initialize the USB hardware */
 
   imxrt_usbreset(priv);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_dma.c b/arch/arm/src/lc823450/lc823450_dma.c
index 84f427723a3..660a3d82663 100644
--- a/arch/arm/src/lc823450/lc823450_dma.c
+++ b/arch/arm/src/lc823450/lc823450_dma.c
@@ -384,7 +384,6 @@ void arm_dma_initialize(void)
 
 void lc823450_dmaconfigure(uint8_t dmarequest, bool alternate)
 {
-  return;
 }
 
 /****************************************************************************
@@ -459,8 +458,6 @@ void lc823450_dmarequest(DMA_HANDLE handle, uint8_t dmarequest)
 
   putreg32(val, DMACCFG(dmach->chn));
   up_disable_clk(LC823450_CLOCK_DMA);
-
-  return;
 }
 
 /****************************************************************************
@@ -665,5 +662,4 @@ void lc823450_dmastop(DMA_HANDLE handle)
     }
 
   spin_unlock_irqrestore(NULL, flags);
-  return;
 }
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index 3aa6b6e8a7e..4a33df3262a 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -262,8 +262,6 @@ static void lc823450_extint_clr(int irq)
 
   regaddr = INTC_REG(EXTINTCLR_BASE, port);
   putreg32(1 << pin, regaddr);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_rtc.c b/arch/arm/src/lc823450/lc823450_rtc.c
index e940d8e4af7..2652c03cfc2 100644
--- a/arch/arm/src/lc823450/lc823450_rtc.c
+++ b/arch/arm/src/lc823450/lc823450_rtc.c
@@ -205,8 +205,6 @@ static void rtc_pmnotify(struct pm_callback_s *cb, enum pm_state_e pmstate)
     default:
       break;
     }
-
-  return;
 }
 #endif /* CONFIG_RTC_SAVE_DEFAULT */
 
@@ -764,7 +762,6 @@ void up_rtc_clear_default(void)
   bchlib_write(handle, (void *)&rtc_def,
                CONFIG_RTC_SAVE_SECTOR_OFFSET * 512, sizeof(rtc_def));
   bchlib_teardown(handle);
-  return;
 }
 
 #endif /* CONFIG_RTC_SAVE_DEFAULT */
diff --git a/arch/arm/src/lc823450/lc823450_serial.c b/arch/arm/src/lc823450/lc823450_serial.c
index 820a9462b99..4b2d638d2af 100644
--- a/arch/arm/src/lc823450/lc823450_serial.c
+++ b/arch/arm/src/lc823450/lc823450_serial.c
@@ -1071,8 +1071,6 @@ static void  up_hs_detach(struct uart_dev_s *dev)
   lc823450_dmastop(priv->htxdma);
   lc823450_dmastop(priv->hrxdma);
   hs_dmaact = 0;
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_spifi2.c b/arch/arm/src/lc823450/lc823450_spifi2.c
index a31b29797ba..9e5498c5265 100644
--- a/arch/arm/src/lc823450/lc823450_spifi2.c
+++ b/arch/arm/src/lc823450/lc823450_spifi2.c
@@ -158,7 +158,6 @@ static void spiflash_quad_enable_winbond(void)
   putreg32(SF_CTL_ACT, SF_CTL);
 
   wait_txfifo_empty();
-  return;
 }
 
 /****************************************************************************
@@ -210,7 +209,6 @@ static void spiflash_quad_enable_macronix(void)
   putreg32(SF_CTL_ACT, SF_CTL);
 
   wait_txfifo_empty();
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lc823450/lc823450_usbdev.c b/arch/arm/src/lc823450/lc823450_usbdev.c
index c5afeb3d604..1651e75d287 100644
--- a/arch/arm/src/lc823450/lc823450_usbdev.c
+++ b/arch/arm/src/lc823450/lc823450_usbdev.c
@@ -831,8 +831,6 @@ static void lc823450_freeep(struct usbdev_s *dev, struct usbdev_ep_s *ep)
   privep = (struct lc823450_ep_s *)ep;
 
   priv->used &= ~(1 << privep->epphy);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc214x/lpc214x_usbdev.c b/arch/arm/src/lpc214x/lpc214x_usbdev.c
index 3db5e988677..0a2ba73c86b 100644
--- a/arch/arm/src/lpc214x/lpc214x_usbdev.c
+++ b/arch/arm/src/lpc214x/lpc214x_usbdev.c
@@ -1992,8 +1992,6 @@ static inline void lpc214x_ep0dataoutinterrupt(struct lpc214x_usbdev_s *priv)
       ep0 = &priv->eplist[LPC214X_EP0_IN];
       lpc214x_epstall(&ep0->ep, false);
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_io.c b/arch/arm/src/lpc2378/lpc23xx_io.c
index 77de66a175e..78c51c21817 100644
--- a/arch/arm/src/lpc2378/lpc23xx_io.c
+++ b/arch/arm/src/lpc2378/lpc23xx_io.c
@@ -98,10 +98,6 @@ void io_init(void)
   /* Status LED P1.19 */
 
   dir_putreg8((1 << 3), FIO1DIR2_OFFSET);
-
-  /* other io setup here */
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
index 99d46596776..36fe88b0567 100644
--- a/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
+++ b/arch/arm/src/lpc2378/lpc23xx_pllsetup.c
@@ -256,6 +256,4 @@ void configure_pll(void)
   SCB_SCS |= 0x01;
 
   io_init();
-
-  return;
 }
diff --git a/arch/arm/src/lpc43xx/lpc43_usb0dev.c b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
index f43e147c654..71f3f90c111 100644
--- a/arch/arm/src/lpc43xx/lpc43_usb0dev.c
+++ b/arch/arm/src/lpc43xx/lpc43_usb0dev.c
@@ -2818,8 +2818,6 @@ void arm_usbinitialize(void)
   /* Reset/Re-initialize the USB hardware */
 
   lpc43_usbreset(priv);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/nrf52/nrf52_spi.c b/arch/arm/src/nrf52/nrf52_spi.c
index b42fb8d07ba..f0ce10753aa 100644
--- a/arch/arm/src/nrf52/nrf52_spi.c
+++ b/arch/arm/src/nrf52/nrf52_spi.c
@@ -903,8 +903,6 @@ static void nrf52_spi_setbits(struct spi_dev_s *dev, int nbits)
     {
       spierr("ERROR: nbits not supported: %d\n", nbits);
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/rp2040/rp2040_adc.c b/arch/arm/src/rp2040/rp2040_adc.c
index 70765ac2ef3..c37040b2f8e 100644
--- a/arch/arm/src/rp2040/rp2040_adc.c
+++ b/arch/arm/src/rp2040/rp2040_adc.c
@@ -310,8 +310,6 @@ static void get_next_channel(void)
 
       next += 1;
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/rp2040/rp2040_cpupause.c b/arch/arm/src/rp2040/rp2040_cpupause.c
index 737915c84ab..78059a8486c 100644
--- a/arch/arm/src/rp2040/rp2040_cpupause.c
+++ b/arch/arm/src/rp2040/rp2040_cpupause.c
@@ -432,7 +432,6 @@ void rp2040_send_irqreq(int irqreq)
   /* Finally unlock the spinlock to proceed the handler */
 
   spin_unlock(&g_cpu_wait[0]);
-  return;
 }
 
 #endif /* CONFIG_SMP */
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
index 8554546cff9..7be93712bd9 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
@@ -1889,10 +1889,6 @@ static void up_pm_notify(struct pm_callback_s *cb, int domain,
 
     /* get the clock freq */
   }
-
-  /* return */
-
-  return;
 }
 #endif
 
diff --git a/arch/arm/src/tiva/common/tiva_can.c b/arch/arm/src/tiva/common/tiva_can.c
index 15b6b9096ba..7fd5613f2f4 100644
--- a/arch/arm/src/tiva/common/tiva_can.c
+++ b/arch/arm/src/tiva/common/tiva_can.c
@@ -886,7 +886,6 @@ int tivacan_rxhandler(int argc, char** argv)
 
 static void tivacan_rxintctl(struct can_dev_s *dev, bool enable)
 {
-  return;
 }
 
 /****************************************************************************
@@ -906,7 +905,6 @@ static void tivacan_rxintctl(struct can_dev_s *dev, bool enable)
 
 static void tivacan_txintctl(struct can_dev_s *dev, bool enable)
 {
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/renesas/src/rx65n/rx65n_usbhost.c b/arch/renesas/src/rx65n/rx65n_usbhost.c
index 8161f26c4ca..f0da8cd9269 100644
--- a/arch/renesas/src/rx65n/rx65n_usbhost.c
+++ b/arch/renesas/src/rx65n/rx65n_usbhost.c
@@ -2881,8 +2881,6 @@ void usb_hstd_brdy_pipe_process(uint16_t bitsts)
             }
         }
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -2908,8 +2906,6 @@ void usb_hstd_nrdy_pipe_process(uint16_t bitsts)
           usb_hstd_nrdy_endprocess(i);
         }
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -2970,8 +2966,6 @@ void usb_hstd_bemp_pipe_process(uint16_t bitsts)
             }
         }
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/risc-v/src/bl602/bl602_netdev.c b/arch/risc-v/src/bl602/bl602_netdev.c
index 409fbfbbecd..fff3bd1d59c 100644
--- a/arch/risc-v/src/bl602/bl602_netdev.c
+++ b/arch/risc-v/src/bl602/bl602_netdev.c
@@ -1153,7 +1153,6 @@ static void scan_complete_indicate(void *data, void *param)
     }
 
   kmm_free(data);
-  return;
 }
 
 static int rssi_compare(const void *arg1, const void *arg2)
diff --git a/arch/risc-v/src/bl602/bl602_spi.c b/arch/risc-v/src/bl602/bl602_spi.c
index 484a8ee06fb..4e4604ab1bc 100644
--- a/arch/risc-v/src/bl602/bl602_spi.c
+++ b/arch/risc-v/src/bl602/bl602_spi.c
@@ -1092,8 +1092,6 @@ static void bl602_spi_dma_exchange(struct bl602_spi_priv_s *priv,
     {
       kmm_free(rx_lli);
     }
-
-  return;
 }
 #endif
 
diff --git a/arch/risc-v/src/bl602/bl602_start.c b/arch/risc-v/src/bl602/bl602_start.c
index 158ae42c205..404fffae6b5 100644
--- a/arch/risc-v/src/bl602/bl602_start.c
+++ b/arch/risc-v/src/bl602/bl602_start.c
@@ -143,14 +143,11 @@ __cyg_profile_func_enter(void *this_fn, void *call_site)
       while (1)
         ;
     }
-
-  return;
 }
 
 void noinstrument_function locate_code(".tcm_code")
 __cyg_profile_func_exit(void *this_fn, void *call_site)
 {
-  return;
 }
 #endif
 
diff --git a/arch/sparc/src/s698pm/s698pm-irq.c b/arch/sparc/src/s698pm/s698pm-irq.c
index d8d717ffff0..35bda8535d6 100644
--- a/arch/sparc/src/s698pm/s698pm-irq.c
+++ b/arch/sparc/src/s698pm/s698pm-irq.c
@@ -456,8 +456,6 @@ void sparc_clrpend_irq(int irq)
 
       putreg32(1 << cpuint, S698PM_IRQREG_ICLEAR);
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/x86_64/src/intel64/intel64_irq.c b/arch/x86_64/src/intel64/intel64_irq.c
index 40a3b9c1733..3e9494e5f8d 100644
--- a/arch/x86_64/src/intel64/intel64_irq.c
+++ b/arch/x86_64/src/intel64/intel64_irq.c
@@ -359,8 +359,6 @@ static void up_ioapic_init(void)
       up_ioapic_pin_set_vector(i, TRIGGER_RISING_EDGE, IRQ0 + i);
       up_ioapic_mask_pin(i);
     }
-
-  return;
 }
 #endif
 
diff --git a/arch/x86_64/src/intel64/intel64_tickless.c b/arch/x86_64/src/intel64/intel64_tickless.c
index 613f5a7c3ee..6524e97056c 100644
--- a/arch/x86_64/src/intel64/intel64_tickless.c
+++ b/arch/x86_64/src/intel64/intel64_tickless.c
@@ -134,8 +134,6 @@ void up_timer_initialize(void)
 #else
   irq_attach(TMR_IRQ, (xcpt_t)up_alarm_expire, NULL);
 #endif
-
-  return;
 }
 
 static inline uint64_t up_ts2tick(const struct timespec *ts)
@@ -339,8 +337,6 @@ void up_timer_expire(void)
 
   up_mask_tmr();
   sched_timer_expiration();
-
-  return;
 }
 
 #else /* CONFIG_SCHED_TICKLESS_ALARM */
@@ -470,8 +466,6 @@ void up_alarm_expire(void)
   up_timer_gettime(&now);
 
   nxsched_alarm_expiration(&now);
-
-  return;
 }
 
 #endif /* CONFIG_SCHED_TICKLESS_ALARM */
diff --git a/arch/x86_64/src/intel64/intel64_timerisr.c b/arch/x86_64/src/intel64/intel64_timerisr.c
index e26ea619fac..2cf7dab15db 100644
--- a/arch/x86_64/src/intel64/intel64_timerisr.c
+++ b/arch/x86_64/src/intel64/intel64_timerisr.c
@@ -129,6 +129,4 @@ void up_timer_initialize(void)
   asm volatile("mfence" : : : "memory");
 
   apic_timer_set(NS_PER_MSEC);
-
-  return;
 }
diff --git a/arch/xtensa/src/esp32/esp32_ble_adapter.c b/arch/xtensa/src/esp32/esp32_ble_adapter.c
index b9e7d6d8bd8..e7afd20ff1b 100644
--- a/arch/xtensa/src/esp32/esp32_ble_adapter.c
+++ b/arch/xtensa/src/esp32/esp32_ble_adapter.c
@@ -2723,8 +2723,6 @@ static void async_wakeup_request_end(int event)
     {
       btdm_wakeup_request_end();
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -2763,7 +2761,6 @@ static bool coex_bt_wakeup_request(void)
 static void coex_bt_wakeup_request_end(void)
 {
   async_wakeup_request_end(BTDM_ASYNC_WAKEUP_REQ_COEX);
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_tickless.c b/arch/xtensa/src/esp32/esp32_tickless.c
index e5e3230e244..e53c74b6e8a 100644
--- a/arch/xtensa/src/esp32/esp32_tickless.c
+++ b/arch/xtensa/src/esp32/esp32_tickless.c
@@ -500,8 +500,6 @@ void up_timer_initialize(void)
   /* Enable the timer 0 CPU interrupt. */
 
   up_enable_irq(XTENSA_IRQ_TIMER0);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/arch/xtensa/src/esp32/esp32_twai.c b/arch/xtensa/src/esp32/esp32_twai.c
index 59ba6f161e5..154f6ede5f8 100644
--- a/arch/xtensa/src/esp32/esp32_twai.c
+++ b/arch/xtensa/src/esp32/esp32_twai.c
@@ -544,8 +544,6 @@ static void esp32twai_shutdown(struct can_dev_s *dev)
       esp32_teardown_irq(priv->cpu, priv->periph, priv->cpuint);
       priv->cpuint = -ENOMEM;
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -589,8 +587,6 @@ static void esp32twai_rxint(struct can_dev_s *dev, bool enable)
 
   twai_putreg(TWAI_INT_ENA_REG, regval);
   spin_unlock_irqrestore(&priv->lock, flags);
-
-  return;
 }
 
 /****************************************************************************
diff --git a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
index dd6182bd2f4..dfccd78b735 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_crashdump.c
@@ -239,5 +239,4 @@ exit:
 #if defined(CONFIG_CXD56_RESET_ON_CRASH)
   board_reset_on_crash();
 #endif
-  return;
 }
diff --git a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
index 17101fad3dc..6c41455eaef 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_imageproc.c
@@ -484,8 +484,6 @@ static void get_rect_info(imageproc_imginfo_t *imginfo,
       *w      = imginfo->w;
       *h      = imginfo->h;
     }
-
-  return;
 }
 
 static int  chk_imgsize(imageproc_imginfo_t *imginfo)
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
index 3b6012eb943..c2ab78de1ae 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_bringup.c
@@ -168,8 +168,6 @@ static void timer_initialize(void)
       snprintf(devname, sizeof(devname), "/dev/timer%d", i);
       cxd56_timer_initialize(devname, i);
     }
-
-  return;
 }
 #endif
 
diff --git a/boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c b/boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c
index 39356a4c1c6..bdbc66b1025 100644
--- a/boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c
+++ b/boards/arm/cxd56xx/spresense/src/cxd56_gpioif.c
@@ -136,8 +136,6 @@ void board_gpio_write(uint32_t pin, int value)
     {
       cxd56_gpio_write(pin, (value > 0));
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
index 7c03f4880c5..6a05885dcf3 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/src/lpc17_40_sdraminitialize.c
@@ -588,7 +588,6 @@ void lx_cpu_sdram_initialize(void)
     }
 
   lx_cpu_sdram_adjust_timing();
-  return;
 }
 
 #endif /* CONFIG_LPC17_40_EMC && CONFIG_LPC17_40_EXTDRAM */
diff --git a/boards/arm/nrf52/nrf52840-dk/src/nrf52_hts221.c b/boards/arm/nrf52/nrf52840-dk/src/nrf52_hts221.c
index 1f21d7a4912..825079eb077 100644
--- a/boards/arm/nrf52/nrf52840-dk/src/nrf52_hts221.c
+++ b/boards/arm/nrf52/nrf52840-dk/src/nrf52_hts221.c
@@ -96,7 +96,6 @@ static int nrf52_hts221_irq_attach(struct hts221_config_s *state,
 static void nrf52_hts221_irq_enable(const struct hts221_config_s *state,
                                     bool enable)
 {
-  return;
 }
 
 /****************************************************************************
@@ -105,7 +104,6 @@ static void nrf52_hts221_irq_enable(const struct hts221_config_s *state,
 
 static void nrf52_hts221_irq_clear(const struct hts221_config_s *state)
 {
-  return;
 }
 
 /****************************************************************************
diff --git a/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c b/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
index 0a3c0729081..d9c707ebbbb 100644
--- a/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
+++ b/boards/risc-v/bl602/bl602evb/src/bl602_bringup.c
@@ -176,8 +176,6 @@ static void ble_uart_write(const uint8_t *bufptr,
   bthci_receive((uint8_t *)bufptr, size);
 
   callback(dummy, 0);
-
-  return;
 }
 
 static int bthci_send(struct bt_driver_s *drv,
@@ -356,7 +354,6 @@ void bl602_hci_uart_init(uint8_t uartid)
 
   bthci_register();
   rw_main_task_post_from_fw();
-  return;
 }
 #endif /* CONFIG_BL602_BLE_CONTROLLER */
 
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
index dda1751b0d9..fe01de8b445 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
+++ b/boards/x86_64/intel64/qemu-intel64/src/qemu_net.c
@@ -52,7 +52,6 @@
 #ifdef CONFIG_NET
 void up_netinitialize(void)
 {
-  return;
 }
 #endif
 
diff --git a/drivers/audio/wm8994.c b/drivers/audio/wm8994.c
index 7e94d44a246..275666abcf7 100644
--- a/drivers/audio/wm8994.c
+++ b/drivers/audio/wm8994.c
@@ -592,8 +592,6 @@ static void wm8994_settreble(FAR struct wm8994_dev_s *priv, uint8_t treble)
 static void wm8994_setdatawidth(FAR struct wm8994_dev_s *priv)
 {
   /* TODO */
-
-  return;
 }
 
 /* Name: wm8994_setbitrate
@@ -640,8 +638,6 @@ static void wm8994_setbitrate(FAR struct wm8994_dev_s *priv)
   wm8994_setsamplefreq(priv);
 
   I2S_RXSAMPLERATE(priv->i2s, priv->samprate);
-
-  return;
 }
 
 /* Name: wm8994_getcaps
diff --git a/drivers/lcd/ht16k33_14seg.c b/drivers/lcd/ht16k33_14seg.c
index f9e43b6bf33..1d398c2ac15 100644
--- a/drivers/lcd/ht16k33_14seg.c
+++ b/drivers/lcd/ht16k33_14seg.c
@@ -442,7 +442,6 @@ static void lcd_scroll_up(FAR struct ht16k33_dev_s *priv)
   ht16k33_clear_display(priv);
 
   kmm_free(data);
-  return;
 }
 
 /****************************************************************************
diff --git a/drivers/lcd/pcf8574_lcd_backpack.c b/drivers/lcd/pcf8574_lcd_backpack.c
index 5eaf874c8ff..deea3b417f0 100644
--- a/drivers/lcd/pcf8574_lcd_backpack.c
+++ b/drivers/lcd/pcf8574_lcd_backpack.c
@@ -166,8 +166,6 @@ static void pca8574_write(FAR struct pcf8574_lcd_dev_s *priv, uint8_t data)
       lcdinfo("pca8574_write() failed: %d\n", ret);
       return;
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -716,7 +714,6 @@ static void lcd_scroll_up(FAR struct pcf8574_lcd_dev_s *priv)
   lcd_set_curpos(priv, priv->cfg.rows - 1, 0);
 
   kmm_free(data);
-  return;
 }
 
 /****************************************************************************
diff --git a/drivers/lcd/st7032.c b/drivers/lcd/st7032.c
index da513d9b8ee..67f1f120874 100644
--- a/drivers/lcd/st7032.c
+++ b/drivers/lcd/st7032.c
@@ -383,7 +383,6 @@ static void lcd_scroll_up(FAR struct st7032_dev_s *priv)
   lcd_set_curpos(priv);
 
   kmm_free(data);
-  return;
 }
 
 /****************************************************************************
diff --git a/drivers/motor/foc/foc_dummy.c b/drivers/motor/foc/foc_dummy.c
index 91a69579d23..f85c48523ec 100644
--- a/drivers/motor/foc/foc_dummy.c
+++ b/drivers/motor/foc/foc_dummy.c
@@ -671,6 +671,4 @@ void foc_dummy_update(void)
     }
 
   leave_critical_section(flags);
-
-  return;
 }
diff --git a/drivers/sensors/bmp180.c b/drivers/sensors/bmp180.c
index 5fd5764ebee..d70ede73740 100644
--- a/drivers/sensors/bmp180.c
+++ b/drivers/sensors/bmp180.c
@@ -282,8 +282,6 @@ static void bmp180_putreg8(FAR struct bmp180_dev_s *priv, uint8_t regaddr,
       snerr("ERROR: i2c_write failed: %d\n", ret);
       return;
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/drivers/sensors/vl53l1x.c b/drivers/sensors/vl53l1x.c
index c997d3c317d..0d5f259abc5 100644
--- a/drivers/sensors/vl53l1x.c
+++ b/drivers/sensors/vl53l1x.c
@@ -952,8 +952,6 @@ static void vl53l1x_putreg8(FAR struct vl53l1x_dev_s *priv, uint16_t regaddr,
       snerr("ERROR: i2c_write failed: %d\n", ret);
       return;
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -990,8 +988,6 @@ static void vl53l1x_putreg16(FAR struct vl53l1x_dev_s *priv,
       snerr("ERROR: i2c_write failed: %d\n", ret);
       return;
     }
-
-  return;
 }
 
 /****************************************************************************
@@ -1030,8 +1026,6 @@ static void vl53l1x_putreg32(FAR struct vl53l1x_dev_s *priv,
       snerr("ERROR: i2c_write failed: %d\n", ret);
       return;
     }
-
-  return;
 }
 
 /****************************************************************************
diff --git a/drivers/video/video.c b/drivers/video/video.c
index bf4adecba39..c799da0944a 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -700,8 +700,6 @@ static void change_video_state(FAR video_mng_t    *vmng,
     }
 
   vmng->video_inf.state = updated_next_state;
-
-  return;
 }
 
 static bool is_taking_still_picture(FAR video_mng_t *vmng)
@@ -743,8 +741,6 @@ static void initialize_streamresources(FAR video_type_inf_t *type_inf)
                            type_inf->fmt,
                            &type_inf->frame_interval);
   video_framebuff_init(&type_inf->bufinf);
-
-  return;
 }
 
 static int32_t get_default_value(uint32_t id)
@@ -907,8 +903,6 @@ static void initialize_resources(FAR video_mng_t *vmng)
   initialize_streamresources(&vmng->video_inf);
   initialize_streamresources(&vmng->still_inf);
   initialize_scenes_parameter();
-
-  return;
 }
 
 static void cleanup_streamresources(FAR video_type_inf_t *type_inf)
@@ -918,8 +912,6 @@ static void cleanup_streamresources(FAR video_type_inf_t *type_inf)
   nxmutex_destroy(&type_inf->lock_state);
   memset(type_inf, 0, sizeof(video_type_inf_t));
   type_inf->remaining_capnum = VIDEO_REMAINING_CAPNUM_INFINITY;
-
-  return;
 }
 
 static void cleanup_scene_parameter(video_scene_params_t *sp)
@@ -958,8 +950,6 @@ static void cleanup_resources(FAR video_mng_t *vmng)
   cleanup_streamresources(&vmng->video_inf);
   cleanup_streamresources(&vmng->still_inf);
   cleanup_scenes_parameter();
-
-  return;
 }
 
 static bool is_sem_waited(FAR sem_t *sem)
diff --git a/drivers/wireless/spirit/drivers/spirit_netdev.c b/drivers/wireless/spirit/drivers/spirit_netdev.c
index 7b86cc6044b..01245880825 100644
--- a/drivers/wireless/spirit/drivers/spirit_netdev.c
+++ b/drivers/wireless/spirit/drivers/spirit_netdev.c
@@ -824,7 +824,6 @@ errout_with_csma:
 errout_with_lock:
   nxmutex_unlock(&priv->txlock);
   NETDEV_TXERRORS(&priv->radio.r_dev);
-  return;
 }
 
 /****************************************************************************
diff --git a/libs/libc/misc/lib_ncompress.c b/libs/libc/misc/lib_ncompress.c
index 522aadc309f..26b4746619c 100644
--- a/libs/libc/misc/lib_ncompress.c
+++ b/libs/libc/misc/lib_ncompress.c
@@ -712,8 +712,6 @@ void compress(int fdin, int fdout)
     write_error();
 
   bytes_out += (outbits + 7) >> 3;
-
-  return;
 }
 
 /* Decompress stdin to stdout.  This routine adapts to the codes in the
diff --git a/net/igmp/igmp_input.c b/net/igmp/igmp_input.c
index d79ec2b1261..bde3a5f5a25 100644
--- a/net/igmp/igmp_input.c
+++ b/net/igmp/igmp_input.c
@@ -297,7 +297,6 @@ void igmp_input(struct net_driver_s *dev)
 
 drop:
   dev->d_len = 0;
-  return;
 }
 
 #endif /* CONFIG_NET_IGMP */