Update kconfig2html.c

Fix nuttx coding style
diff --git a/arch/arm/include/cxd56xx/gnss_type.h b/arch/arm/include/cxd56xx/gnss_type.h
index 871fdaf..95948d4 100644
--- a/arch/arm/include/cxd56xx/gnss_type.h
+++ b/arch/arm/include/cxd56xx/gnss_type.h
@@ -223,7 +223,7 @@
 
 /* GNSS positionig data elements */
 
-/*  Day (UTC) */
+/* Day (UTC) */
 
 struct cxd56_gnss_date_s
 {
diff --git a/arch/arm/include/eoss3/chip.h b/arch/arm/include/eoss3/chip.h
index 4c80933..15e0d4c 100644
--- a/arch/arm/include/eoss3/chip.h
+++ b/arch/arm/include/eoss3/chip.h
@@ -40,4 +40,4 @@
 #define NVIC_SYSH_PRIORITY_MAX     0x00 /* Zero is maximum priority */
 #define NVIC_SYSH_PRIORITY_STEP    0x20 /* Three bits of interrupt pri used */
 
-#endif  /* __ARCH_ARM_INCLUDE_EFM32_CHIP_H */
\ No newline at end of file
+#endif /* __ARCH_ARM_INCLUDE_EFM32_CHIP_H */
\ No newline at end of file
diff --git a/arch/arm/include/imxrt/imxrt105x_irq.h b/arch/arm/include/imxrt/imxrt105x_irq.h
index 8f9a134..b89ea53 100644
--- a/arch/arm/include/imxrt/imxrt105x_irq.h
+++ b/arch/arm/include/imxrt/imxrt105x_irq.h
@@ -136,7 +136,7 @@
 #define IMXRT_IRQ_SRC          (IMXRT_IRQ_EXTINT + 98)  /* SRC interrupt */
 #define IMXRT_IRQ_RESERVED99   (IMXRT_IRQ_EXTINT + 99)  /* Reserved */
 #define IMXRT_IRQ_GPT1         (IMXRT_IRQ_EXTINT + 100) /* GPT1 interrupt */
-#define IMXRT_IRQ_GPT2         (IMXRT_IRQ_EXTINT + 101) /*  GPT2 interrupt */
+#define IMXRT_IRQ_GPT2         (IMXRT_IRQ_EXTINT + 101) /* GPT2 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_0   (IMXRT_IRQ_EXTINT + 102) /* FLEXPWM1 capture/compare/reload 0 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_1   (IMXRT_IRQ_EXTINT + 103) /* FLEXPWM1 capture/compare/reload 1 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_2   (IMXRT_IRQ_EXTINT + 104) /* FLEXPWM1 capture/compare/reload 2 interrupt */
diff --git a/arch/arm/include/imxrt/imxrt106x_irq.h b/arch/arm/include/imxrt/imxrt106x_irq.h
index 00d443c..7a4db1a 100644
--- a/arch/arm/include/imxrt/imxrt106x_irq.h
+++ b/arch/arm/include/imxrt/imxrt106x_irq.h
@@ -136,7 +136,7 @@
 #define IMXRT_IRQ_SRC          (IMXRT_IRQ_EXTINT + 98)  /* SRC interrupt */
 #define IMXRT_IRQ_RESERVED99   (IMXRT_IRQ_EXTINT + 99)  /* Reserved */
 #define IMXRT_IRQ_GPT1         (IMXRT_IRQ_EXTINT + 100) /* GPT1 interrupt */
-#define IMXRT_IRQ_GPT2         (IMXRT_IRQ_EXTINT + 101) /*  GPT2 interrupt */
+#define IMXRT_IRQ_GPT2         (IMXRT_IRQ_EXTINT + 101) /* GPT2 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_0   (IMXRT_IRQ_EXTINT + 102) /* FLEXPWM1 capture/compare/reload 0 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_1   (IMXRT_IRQ_EXTINT + 103) /* FLEXPWM1 capture/compare/reload 1 interrupt */
 #define IMXRT_IRQ_FLEXPWM1_2   (IMXRT_IRQ_EXTINT + 104) /* FLEXPWM1 capture/compare/reload 2 interrupt */
diff --git a/arch/arm/include/kinetis/kinetis_k40irq.h b/arch/arm/include/kinetis/kinetis_k40irq.h
index df62786..45fae58 100644
--- a/arch/arm/include/kinetis/kinetis_k40irq.h
+++ b/arch/arm/include/kinetis/kinetis_k40irq.h
@@ -93,7 +93,7 @@
 #define KINETIS_IRQ_CAN1ERR  (KINETIS_IRQ_FIRST + 39)  /* 39: CAN1 Error */
 #define KINETIS_IRQ_CAN1TW   (KINETIS_IRQ_FIRST + 40)  /* 40: CAN1 Transmit Warning */
 #define KINETIS_IRQ_CAN1RW   (KINETIS_IRQ_FIRST + 41)  /* 41: CAN1 Receive Warning */
-#define KINETIS_IRQ_CAN1WU   (KINETIS_IRQ_FIRST + 42)  /*  42: CAN1 Wake UP */
+#define KINETIS_IRQ_CAN1WU   (KINETIS_IRQ_FIRST + 42)  /* 42: CAN1 Wake UP */
 #define KINETIS_IRQ_RESVD43  (KINETIS_IRQ_FIRST + 43)  /* 43: Reserved */
 #define KINETIS_IRQ_RESVD44  (KINETIS_IRQ_FIRST + 44)  /* 44: Reserved */
 #define KINETIS_IRQ_UART0S   (KINETIS_IRQ_FIRST + 45)  /* 45: UART0 status */
diff --git a/arch/arm/include/kinetis/kinetis_k60irq.h b/arch/arm/include/kinetis/kinetis_k60irq.h
index ffddc2a..0c791b4 100644
--- a/arch/arm/include/kinetis/kinetis_k60irq.h
+++ b/arch/arm/include/kinetis/kinetis_k60irq.h
@@ -93,7 +93,7 @@
 #define KINETIS_IRQ_CAN1ERR  (KINETIS_IRQ_FIRST + 39)  /* 39: CAN1 Error */
 #define KINETIS_IRQ_CAN1TW   (KINETIS_IRQ_FIRST + 40)  /* 40: CAN1 Transmit Warning */
 #define KINETIS_IRQ_CAN1RW   (KINETIS_IRQ_FIRST + 41)  /* 41: CAN1 Receive Warning */
-#define KINETIS_IRQ_CAN1WU   (KINETIS_IRQ_FIRST + 42)  /*  42: CAN1 Wake UP */
+#define KINETIS_IRQ_CAN1WU   (KINETIS_IRQ_FIRST + 42)  /* 42: CAN1 Wake UP */
 #define KINETIS_IRQ_RESVD43  (KINETIS_IRQ_FIRST + 43)  /* 43: Reserved */
 #define KINETIS_IRQ_RESVD44  (KINETIS_IRQ_FIRST + 44)  /* 44: Reserved */
 #define KINETIS_IRQ_UART0S   (KINETIS_IRQ_FIRST + 45)  /* 45: UART0 status */
diff --git a/arch/arm/include/samv7/same70_irq.h b/arch/arm/include/samv7/same70_irq.h
index a5fa01f..4fdb6bf 100644
--- a/arch/arm/include/samv7/same70_irq.h
+++ b/arch/arm/include/samv7/same70_irq.h
@@ -153,11 +153,11 @@
 #define SAM_IRQ_MCAN01        (SAM_IRQ_EXTINT+SAM_PID_MCAN01) /* CAN0 IRQ line 1 */
 #define SAM_IRQ_MCAN10        (SAM_IRQ_EXTINT+SAM_PID_MCAN10) /* CAN1 IRQ line 0 */
 #define SAM_IRQ_MCAN11        (SAM_IRQ_EXTINT+SAM_PID_MCAN11) /* CAN1 IRQ line 1 */
-#define SAM_IRQ_EMAC0         (SAM_IRQ_EXTINT+SAM_PID_EMAC0)  /*  Ethernet MAC */
+#define SAM_IRQ_EMAC0         (SAM_IRQ_EXTINT+SAM_PID_EMAC0)  /* Ethernet MAC */
 #define SAM_IRQ_AFEC1         (SAM_IRQ_EXTINT+SAM_PID_AFEC1)  /* Analog Front End 1 */
 #define SAM_IRQ_TWIHS2        (SAM_IRQ_EXTINT+SAM_PID_TWIHS2) /* Two-Wire Interface 2 */
 #define SAM_IRQ_SPI1          (SAM_IRQ_EXTINT+SAM_PID_SPI1)   /* Serial Peripheral Interface 1 */
-#define SAM_IRQ_QSPI          (SAM_IRQ_EXTINT+SAM_PID_QSPI)   /*  Quad I/O Serial Peripheral Interface */
+#define SAM_IRQ_QSPI          (SAM_IRQ_EXTINT+SAM_PID_QSPI)   /* Quad I/O Serial Peripheral Interface */
 #define SAM_IRQ_UART2         (SAM_IRQ_EXTINT+SAM_PID_UART2)  /* Universal Asynchronous Receiver Transmitter 2 */
 #define SAM_IRQ_UART3         (SAM_IRQ_EXTINT+SAM_PID_UART3)  /* Universal Asynchronous Receiver Transmitter 3 */
 #define SAM_IRQ_UART4         (SAM_IRQ_EXTINT+SAM_PID_UART4)  /* Universal Asynchronous Receiver Transmitter 4 */
diff --git a/arch/arm/include/samv7/samv71_irq.h b/arch/arm/include/samv7/samv71_irq.h
index 717c6a2..2405117 100644
--- a/arch/arm/include/samv7/samv71_irq.h
+++ b/arch/arm/include/samv7/samv71_irq.h
@@ -153,11 +153,11 @@
 #define SAM_IRQ_MCAN01        (SAM_IRQ_EXTINT+SAM_PID_MCAN01) /* CAN0 IRQ line 1 */
 #define SAM_IRQ_MCAN10        (SAM_IRQ_EXTINT+SAM_PID_MCAN10) /* CAN1 IRQ line 0 */
 #define SAM_IRQ_MCAN11        (SAM_IRQ_EXTINT+SAM_PID_MCAN11) /* CAN1 IRQ line 1 */
-#define SAM_IRQ_EMAC0         (SAM_IRQ_EXTINT+SAM_PID_EMAC0)  /*  Ethernet MAC */
+#define SAM_IRQ_EMAC0         (SAM_IRQ_EXTINT+SAM_PID_EMAC0)  /* Ethernet MAC */
 #define SAM_IRQ_AFEC1         (SAM_IRQ_EXTINT+SAM_PID_AFEC1)  /* Analog Front End 1 */
 #define SAM_IRQ_TWIHS2        (SAM_IRQ_EXTINT+SAM_PID_TWIHS2) /* Two-Wire Interface 2 */
 #define SAM_IRQ_SPI1          (SAM_IRQ_EXTINT+SAM_PID_SPI1)   /* Serial Peripheral Interface 1 */
-#define SAM_IRQ_QSPI          (SAM_IRQ_EXTINT+SAM_PID_QSPI)   /*  Quad I/O Serial Peripheral Interface */
+#define SAM_IRQ_QSPI          (SAM_IRQ_EXTINT+SAM_PID_QSPI)   /* Quad I/O Serial Peripheral Interface */
 #define SAM_IRQ_UART2         (SAM_IRQ_EXTINT+SAM_PID_UART2)  /* Universal Asynchronous Receiver Transmitter 2 */
 #define SAM_IRQ_UART3         (SAM_IRQ_EXTINT+SAM_PID_UART3)  /* Universal Asynchronous Receiver Transmitter 3 */
 #define SAM_IRQ_UART4         (SAM_IRQ_EXTINT+SAM_PID_UART4)  /* Universal Asynchronous Receiver Transmitter 4 */
diff --git a/arch/arm/src/at32/at32_can_sock.c b/arch/arm/src/at32/at32_can_sock.c
index 72a84a1..0b2af93 100644
--- a/arch/arm/src/at32/at32_can_sock.c
+++ b/arch/arm/src/at32/at32_can_sock.c
@@ -1149,10 +1149,10 @@
 static int at32can_netdev_ioctl(struct net_driver_s *dev, int cmd,
                                  unsigned long arg)
 {
-#if 0  
+#if 0
   struct at32_can_s *priv = (struct at32_can_s *)dev->d_private;
-#endif  
-  int                 ret  = OK;
+#endif
+  int ret  = OK;
 
   switch (cmd)
     {
diff --git a/arch/arm/src/at32/at32_eth.c b/arch/arm/src/at32/at32_eth.c
index a83816b..b371537 100644
--- a/arch/arm/src/at32/at32_eth.c
+++ b/arch/arm/src/at32/at32_eth.c
@@ -4020,7 +4020,7 @@
 
 #ifdef CONFIG_AT32_CAN2
   at32_cansockinitialize(2);
-#endif  
+#endif
 
 #endif
 }
diff --git a/arch/arm/src/at32/at32_serial.c b/arch/arm/src/at32/at32_serial.c
index c126bd7..b776cd9 100644
--- a/arch/arm/src/at32/at32_serial.c
+++ b/arch/arm/src/at32/at32_serial.c
@@ -105,7 +105,7 @@
                  DMA_CCR_MSIZE_8BITS   | \
                  CONFIG_USART_RXDMAPRIO)
 
-#endif  /* SERIAL_HAVE_RXDMA */
+#endif /* SERIAL_HAVE_RXDMA */
 
 #ifdef SERIAL_HAVE_TXDMA
 
diff --git a/arch/arm/src/at32/at32f43xx_flash.c b/arch/arm/src/at32/at32f43xx_flash.c
index 75815f6..e1ade0f 100644
--- a/arch/arm/src/at32/at32f43xx_flash.c
+++ b/arch/arm/src/at32/at32f43xx_flash.c
@@ -102,7 +102,7 @@
           putreg32(FLASH_KEY2, AT32_FLASH_UNLOCK2);
         }
     }
-#endif  
+#endif
 }
 
 static void flash_lock(void)
@@ -112,7 +112,7 @@
 #ifdef AT32_FLASH_BANK2_START
   if (AT32_FLASH_BANK2_START < AT32_FLASH_NPAGES)
     modifyreg32(AT32_FLASH_CTRL2, 0, FLASH_CTRL_OPLK);
-#endif    
+#endif
 }
 
 #if defined(CONFIG_AT32_FLASH_WORKAROUND_DATA_CACHE_CORRUPTION_ON_RWW)
diff --git a/arch/arm/src/cxd56xx/cxd56_nxaudio.c b/arch/arm/src/cxd56xx/cxd56_nxaudio.c
index 8de5c84..6551111 100644
--- a/arch/arm/src/cxd56xx/cxd56_nxaudio.c
+++ b/arch/arm/src/cxd56xx/cxd56_nxaudio.c
@@ -352,13 +352,13 @@
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
 static int     cxd56_stop(struct audio_lowerhalf_s *lower,
                           void *session);
-#endif  /* CONFIG_AUDIO_EXCLUDE_STOP */
+#endif /* CONFIG_AUDIO_EXCLUDE_STOP */
 #ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
 static int     cxd56_pause(struct audio_lowerhalf_s *lower,
                            void *session);
 static int     cxd56_resume(struct audio_lowerhalf_s *lower,
                             void *session);
-#endif  /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
+#endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
 static int     cxd56_reserve(struct audio_lowerhalf_s *lower,
                              void **session);
 static int     cxd56_release(struct audio_lowerhalf_s *lower,
@@ -370,11 +370,11 @@
 static int     cxd56_start(struct audio_lowerhalf_s *lower);
 #ifndef CONFIG_AUDIO_EXCLUDE_STOP
 static int     cxd56_stop(struct audio_lowerhalf_s *lower);
-#endif  /* CONFIG_AUDIO_EXCLUDE_STOP */
+#endif /* CONFIG_AUDIO_EXCLUDE_STOP */
 #ifndef CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME
 static int     cxd56_pause(struct audio_lowerhalf_s *lower);
 static int     cxd56_resume(struct audio_lowerhalf_s *lower);
-#endif  /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
+#endif /* CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME */
 static int     cxd56_reserve(struct audio_lowerhalf_s *lower);
 static int     cxd56_release(struct audio_lowerhalf_s *lower);
 #endif /* CONFIG_AUDIO_MULTI_SESSION */
diff --git a/arch/arm/src/cxd56xx/cxd56_nxaudio.h b/arch/arm/src/cxd56xx/cxd56_nxaudio.h
index 29baf26..1143e97 100644
--- a/arch/arm/src/cxd56xx/cxd56_nxaudio.h
+++ b/arch/arm/src/cxd56xx/cxd56_nxaudio.h
@@ -282,7 +282,7 @@
   uint32_t                samplerate;       /* Sample rate */
 #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
   int16_t                 volume;           /* Output volume {0..63} */
-#endif  /* CONFIG_AUDIO_EXCLUDE_VOLUME */
+#endif /* CONFIG_AUDIO_EXCLUDE_VOLUME */
   uint8_t                 channels;         /* Number of channels (1..8) */
 
   uint16_t                mic_gain;         /* Mic gain */
diff --git a/arch/arm/src/imxrt/imxrt_lpspi.c b/arch/arm/src/imxrt/imxrt_lpspi.c
index 199d586..f821ec5 100644
--- a/arch/arm/src/imxrt/imxrt_lpspi.c
+++ b/arch/arm/src/imxrt/imxrt_lpspi.c
@@ -1584,7 +1584,7 @@
     }
 }
 
-#endif  /* CONFIG_IMXRT_SPI_DMA */
+#endif /* CONFIG_IMXRT_SPI_DMA */
 
 /****************************************************************************
  * Name: imxrt_lpspi_sndblock
diff --git a/arch/arm/src/kinetis/kinetis_spi.c b/arch/arm/src/kinetis/kinetis_spi.c
index 91383c6..79bc952 100644
--- a/arch/arm/src/kinetis/kinetis_spi.c
+++ b/arch/arm/src/kinetis/kinetis_spi.c
@@ -1275,7 +1275,7 @@
                 0);
 }
 
-#endif  /* CONFIG_KINETIS_SPI_DMA */
+#endif /* CONFIG_KINETIS_SPI_DMA */
 /****************************************************************************
  * Name: spi_sndblock
  *
diff --git a/arch/arm/src/nrf53/nrf53_adc.h b/arch/arm/src/nrf53/nrf53_adc.h
index 3e31efc..e5343ef 100644
--- a/arch/arm/src/nrf53/nrf53_adc.h
+++ b/arch/arm/src/nrf53/nrf53_adc.h
@@ -159,4 +159,4 @@
     const struct nrf53_adc_channel_s *chan,
     int channels);
 
-#endif  /* __ARCH_ARM_SRC_NRF53_NRF53_ADC_H */
+#endif /* __ARCH_ARM_SRC_NRF53_NRF53_ADC_H */
diff --git a/arch/arm/src/nrf53/nrf53_qspi.c b/arch/arm/src/nrf53/nrf53_qspi.c
index bece954..573d508 100644
--- a/arch/arm/src/nrf53/nrf53_qspi.c
+++ b/arch/arm/src/nrf53/nrf53_qspi.c
@@ -135,7 +135,7 @@
   .setbits           = nrf53_qspi_setbits,
 #ifdef CONFIG_QSPI_HWFEATURES
   .hwfeatures        = NULL,
-#endif  
+#endif
   .command           = nrf53_qspi_command,
   .memory            = nrf53_qspi_memory,
   .alloc             = nrf53_qspi_alloc,
diff --git a/arch/arm/src/nrf91/nrf91_spu.c b/arch/arm/src/nrf91/nrf91_spu.c
index eb5613e..b75dd0d 100644
--- a/arch/arm/src/nrf91/nrf91_spu.c
+++ b/arch/arm/src/nrf91/nrf91_spu.c
@@ -169,7 +169,7 @@
 
   modifyreg32(NRF91_SPU_GPIOPORTPERM(0), 0xffffffff, 0);
 }
-#endif  /* NRF91_CONFIG_NONSECURE */
+#endif /* NRF91_CONFIG_NONSECURE */
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/phy62xx/core_bumbee_m0.h b/arch/arm/src/phy62xx/core_bumbee_m0.h
index 3358c41..d76decf 100644
--- a/arch/arm/src/phy62xx/core_bumbee_m0.h
+++ b/arch/arm/src/phy62xx/core_bumbee_m0.h
@@ -102,4 +102,4 @@
 }
 #endif
 
-#endif  /* PHY_BUMBEE_M0 */
+#endif /* PHY_BUMBEE_M0 */
diff --git a/arch/arm/src/rp2040/rp2040_ws2812.c b/arch/arm/src/rp2040/rp2040_ws2812.c
index f2fd2b4..16b4af6 100644
--- a/arch/arm/src/rp2040/rp2040_ws2812.c
+++ b/arch/arm/src/rp2040/rp2040_ws2812.c
@@ -412,17 +412,17 @@
 
           /* Copy swapping WWRRGGBB to GGRRBBWW */
 
-    #ifdef CONFIG_BIG_ENDIAN
+#ifdef CONFIG_BIG_ENDIAN
           xfer_p[3] = *data++;
           xfer_p[1] = *data++;
           xfer_p[0] = *data++;
           xfer_p[2] = *data++;
-    #else /* CONFIG_BIG_ENDIAN */
+#else /* CONFIG_BIG_ENDIAN */
           xfer_p[1] = *data++;
           xfer_p[3] = *data++;
           xfer_p[2] = *data++;
           xfer_p[0] = *data++;
-    #endif /* CONFIG_BIG_ENDIAN */
+#endif /* CONFIG_BIG_ENDIAN */
 
           xfer_p   += 4;
           position += 4;
@@ -490,17 +490,17 @@
 
       /* Copy swapping GGRRBBWW to WWRRGGBB  */
 
-  #ifdef CONFIG_BIG_ENDIAN
+#ifdef CONFIG_BIG_ENDIAN
       *data++ = xfer_p[3];
       *data++ = xfer_p[1];
       *data++ = xfer_p[0];
       *data++ = xfer_p[2];
-  #else /* CONFIG_BIG_ENDIAN */
+#else /* CONFIG_BIG_ENDIAN */
       *data++ = xfer_p[1];
       *data++ = xfer_p[3];
       *data++ = xfer_p[2];
       *data++ = xfer_p[0];
-  #endif /* CONFIG_BIG_ENDIAN */
+#endif /* CONFIG_BIG_ENDIAN */
 
       xfer_p   += 4;
       position += 4;
diff --git a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
index a17dc91..c76865d 100644
--- a/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
+++ b/arch/arm/src/s32k1xx/s32k1xx_lpspi.c
@@ -1763,7 +1763,7 @@
                        (uintptr_t)rxbuffer + nbytes);
 }
 
-#endif  /* CONFIG_S32K1XX_SPI_DMA */
+#endif /* CONFIG_S32K1XX_SPI_DMA */
 
 /****************************************************************************
  * Name: s32k1xx_lpspi_sndblock
diff --git a/arch/arm/src/s32k3xx/s32k3xx_lpspi.c b/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
index f6bb890..679397c 100644
--- a/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
+++ b/arch/arm/src/s32k3xx/s32k3xx_lpspi.c
@@ -1827,7 +1827,7 @@
     }
 }
 
-#endif  /* CONFIG_S32K3XX_SPI_DMA */
+#endif /* CONFIG_S32K3XX_SPI_DMA */
 
 /****************************************************************************
  * Name: s32k3xx_lpspi_sndblock
diff --git a/arch/arm/src/sama5/sam_spi.c b/arch/arm/src/sama5/sam_spi.c
index 343b951..d3579a1 100644
--- a/arch/arm/src/sama5/sam_spi.c
+++ b/arch/arm/src/sama5/sam_spi.c
@@ -302,7 +302,7 @@
   .setfrequency      = spi_setfrequency,
 #ifdef CONFIG_SPI_DELAY_CONTROL
   .setdelay          = spi_setdelay,
-#endif  
+#endif
   .setmode           = spi_setmode,
   .setbits           = spi_setbits,
 #ifdef CONFIG_SPI_HWFEATURES
diff --git a/arch/arm/src/samv7/hardware/sam_pwm.h b/arch/arm/src/samv7/hardware/sam_pwm.h
index 078c288..b714b8f 100644
--- a/arch/arm/src/samv7/hardware/sam_pwm.h
+++ b/arch/arm/src/samv7/hardware/sam_pwm.h
@@ -463,4 +463,4 @@
 #define LEBR_PWMHFEN            (1 << 18) /* Bit 17: PWMH Falling Edge Enable */
 #define LEBR_PWMHREN            (1 << 19) /* Bit 18: PWMH Rising Edge Enable */
 
-#endif  /* CONFIG_SAMV7_PWM */
+#endif /* CONFIG_SAMV7_PWM */
diff --git a/arch/arm/src/samv7/sam_qspi_spi.c b/arch/arm/src/samv7/sam_qspi_spi.c
index 0595b78..9bf9ac6 100644
--- a/arch/arm/src/samv7/sam_qspi_spi.c
+++ b/arch/arm/src/samv7/sam_qspi_spi.c
@@ -741,7 +741,7 @@
 
   qspi_spi_exchange(dev, NULL, buffer, nwords);
 }
-#endif  /* CONFIG_SPI_EXCHANGE */
+#endif /* CONFIG_SPI_EXCHANGE */
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32/hardware/stm32_dbgmcu.h b/arch/arm/src/stm32/hardware/stm32_dbgmcu.h
index 1fe4b25..591a4f3 100644
--- a/arch/arm/src/stm32/hardware/stm32_dbgmcu.h
+++ b/arch/arm/src/stm32/hardware/stm32_dbgmcu.h
@@ -145,7 +145,7 @@
 #  define DBGMCU_APB2_TIM10STOP   (1 << 3)   /* Bit 3:  TIM10 stopped when core is halted */
 #  define DBGMCU_APB2_TIM11STOP   (1 << 4)   /* Bit 4:  TIM11 stopped when core is halted */
 #endif
-#endif  /* CONFIG_STM32_HAVE_IP_DBGMCU_V2 */
+#endif /* CONFIG_STM32_HAVE_IP_DBGMCU_V2 */
 
 #ifdef CONFIG_STM32_HAVE_IP_DBGMCU_V3
 
@@ -178,7 +178,7 @@
 #  define DBGMCU_APB2_TIM20STOP      (1 << 20)  /* Bit 20:  TIM20 stopped when core is halted */
 #  define DBGMCU_APB2_HRTIMSTOP      (1 << 26)  /* Bit 20:  HRTIM stopped when core is halted */
 
-#endif  /* CONFIG_STM32_HAVE_IP_DBGMCU_V3 */
+#endif /* CONFIG_STM32_HAVE_IP_DBGMCU_V3 */
 
 /****************************************************************************
  * Public Types
diff --git a/arch/arm/src/stm32/hardware/stm32f33xxx_comp.h b/arch/arm/src/stm32/hardware/stm32f33xxx_comp.h
index 9ed17ed..f341235 100644
--- a/arch/arm/src/stm32/hardware/stm32f33xxx_comp.h
+++ b/arch/arm/src/stm32/hardware/stm32f33xxx_comp.h
@@ -113,4 +113,4 @@
 #define COMP_CSR_OUT                (1 << 30)                     /* Bit 30: comparator output */
 #define COMP_CSR_LOCK               (1 << 31)                     /* Bit 31: comparator lock */
 
-#endif                          /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_COMP_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32F33XXX_COMP_H */
diff --git a/arch/arm/src/stm32/hardware/stm32g4xxxx_comp.h b/arch/arm/src/stm32/hardware/stm32g4xxxx_comp.h
index 51d37fe..d89ec49 100644
--- a/arch/arm/src/stm32/hardware/stm32g4xxxx_comp.h
+++ b/arch/arm/src/stm32/hardware/stm32g4xxxx_comp.h
@@ -164,4 +164,4 @@
 #define COMP_CSR_VALUE              (1 << 30)                     /* Bit 30: Comparator output status */
 #define COMP_CSR_LOCK               (1 << 31)                     /* Bit 31: Register lock */
 
-#endif                          /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32G4XXXX_COMP_H */
+#endif /* __ARCH_ARM_SRC_STM32_HARDWARE_STM32G4XXXX_COMP_H */
diff --git a/arch/arm/src/stm32/stm32_fdcan_sock.c b/arch/arm/src/stm32/stm32_fdcan_sock.c
index 6f7c4f5..d98c0b0 100644
--- a/arch/arm/src/stm32/stm32_fdcan_sock.c
+++ b/arch/arm/src/stm32/stm32_fdcan_sock.c
@@ -3191,7 +3191,7 @@
 
   return ret;
 }
-#endif  /* CONFIG_NETDEV_IOCTL */
+#endif /* CONFIG_NETDEV_IOCTL */
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32/stm32_foc.c b/arch/arm/src/stm32/stm32_foc.c
index f2da972..eb4e8cd 100644
--- a/arch/arm/src/stm32/stm32_foc.c
+++ b/arch/arm/src/stm32/stm32_foc.c
@@ -161,7 +161,7 @@
 #  if CONFIG_STM32_TIM1_MODE != 2
 #    error TIM1 must be configured in center-aligned mode 1
 #  endif
-#endif  /* CONFIG_STM32_FOC_FOC0 */
+#endif /* CONFIG_STM32_FOC_FOC0 */
 
 /* FOC1 always use TIMER8 for PWM */
 
@@ -901,7 +901,7 @@
   .cntr = 0,
   .lock = NXMUTEX_INITIALIZER,
 };
-#  endif  /* CONFIG_STM32_HAVE_IP_ADC_V1 */
+#  endif /* CONFIG_STM32_HAVE_IP_ADC_V1 */
 
 #  ifdef CONFIG_STM32_HAVE_IP_ADC_V2
 #    if defined(CONFIG_STM32_HAVE_ADC1) || defined(CONFIG_STM32_HAVE_ADC2)
@@ -2457,7 +2457,7 @@
     {
       adc_chan[i] = adc_cfg->chan[i - 1];
     }
-#endif  /* CONFIG_STM32_FOC_G4_ADCCHAN0_WORKAROUND */
+#endif /* CONFIG_STM32_FOC_G4_ADCCHAN0_WORKAROUND */
 
   /* Get the ADC interface */
 
diff --git a/arch/arm/src/stm32/stm32_serial.c b/arch/arm/src/stm32/stm32_serial.c
index d58944f..98888ff 100644
--- a/arch/arm/src/stm32/stm32_serial.c
+++ b/arch/arm/src/stm32/stm32_serial.c
@@ -218,7 +218,7 @@
                  CONFIG_USART_RXDMAPRIO)
 #  endif
 
-#endif  /* SERIAL_HAVE_RXDMA */
+#endif /* SERIAL_HAVE_RXDMA */
 
 #ifdef SERIAL_HAVE_TXDMA
 
@@ -368,7 +368,7 @@
 #    error "Unknown STM32 DMA"
 #  endif
 
-#endif  /* SERIAL_HAVE_TXDMA */
+#endif /* SERIAL_HAVE_TXDMA */
 
 /* Power management definitions */
 
diff --git a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
index e288291..d27bd83 100644
--- a/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
+++ b/arch/arm/src/stm32f7/stm32f74xx75xx_rcc.c
@@ -226,7 +226,7 @@
 
   regval |= RCC_AHB1ENR_OTGHSEN;
 #endif
-#endif  /* CONFIG_STM32F7_OTGFSHS */
+#endif /* CONFIG_STM32F7_OTGFSHS */
 
   putreg32(regval, STM32_RCC_AHB1ENR);   /* Enable peripherals */
 }
diff --git a/arch/arm/src/stm32h7/stm32_rcc.c b/arch/arm/src/stm32h7/stm32_rcc.c
index e7b3f30..55e6b9c 100644
--- a/arch/arm/src/stm32h7/stm32_rcc.c
+++ b/arch/arm/src/stm32h7/stm32_rcc.c
@@ -120,7 +120,7 @@
   stm32_stdclockconfig();
 
 #  endif
-#endif  /* !CONFIG_STM32H7_BYPASS_CLOCKCONFIG */
+#endif /* !CONFIG_STM32H7_BYPASS_CLOCKCONFIG */
 
   /* Enable peripheral clocking */
 
diff --git a/arch/arm/src/stm32h7/stm32_spi_slave.c b/arch/arm/src/stm32h7/stm32_spi_slave.c
index b35cd6d..b8e9e7e 100644
--- a/arch/arm/src/stm32h7/stm32_spi_slave.c
+++ b/arch/arm/src/stm32h7/stm32_spi_slave.c
@@ -121,7 +121,7 @@
 #  if SPI123_KERNEL_CLOCK_FREQ > 200000000
 #    error Not supported SPI123 frequency
 #  endif
-#endif  /* SPI123 */
+#endif /* SPI123 */
 
 #if defined(CONFIG_STM32H7_SPI4_SLAVE) || defined(CONFIG_STM32H7_SPI5_SLAVE)
 #  if STM32_RCC_D2CCIP1R_SPI45SRC == RCC_D2CCIP1R_SPI45SEL_APB
@@ -132,7 +132,7 @@
 #  if SPI45_KERNEL_CLOCK_FREQ > 100000000
 #    error Not supported SPI45 frequency
 #  endif
-#endif  /* SPI45 */
+#endif /* SPI45 */
 
 #if defined(CONFIG_STM32H7_SPI6_SLAVE)
 #  if STM32_RCC_D3CCIPR_SPI6SRC == RCC_D3CCIPR_SPI6SEL_PCLK4
@@ -143,7 +143,7 @@
 #  if SPI6_KERNEL_CLOCK_FREQ > 100000000
 #    error Not supported SPI6 frequency
 #  endif
-#endif  /* SPI6 */
+#endif /* SPI6 */
 
 #if defined (CONFIG_STM32H7_SPI_SLAVE_QSIZE)
 #  if CONFIG_STM32H7_SPI_SLAVE_QSIZE > 65535
diff --git a/arch/arm/src/stm32l4/stm32l4_adc.c b/arch/arm/src/stm32l4/stm32l4_adc.c
index d438eb2..096d2c1 100644
--- a/arch/arm/src/stm32l4/stm32l4_adc.c
+++ b/arch/arm/src/stm32l4/stm32l4_adc.c
@@ -1169,7 +1169,7 @@
         }
     }
 }
-#endif  /* ADC_HAVE_INJECTED */
+#endif /* ADC_HAVE_INJECTED */
 
 /****************************************************************************
  * Name: adc_rccreset
@@ -2279,7 +2279,7 @@
   return OK;
 }
 #endif
-#endif  /* CONFIG_STM32L4_ADC_NOIRQ */
+#endif /* CONFIG_STM32L4_ADC_NOIRQ */
 
 #ifdef ADC_HAVE_DMA
 /****************************************************************************
@@ -2408,7 +2408,7 @@
   adc_modifyreg(priv, STM32L4_ADC_CFGR_OFFSET, 0, ADC_CFGR_DMAEN);
 }
 #endif
-#endif  /* ADC_HAVE_DMA */
+#endif /* ADC_HAVE_DMA */
 
 #ifdef CONFIG_STM32L4_ADC_LL_OPS
 
@@ -2589,7 +2589,7 @@
     }
 }
 
-#endif  /* ADC_HAVE_DMA */
+#endif /* ADC_HAVE_DMA */
 
 /****************************************************************************
  * Name: adc_llops_extsel_set
@@ -2644,7 +2644,7 @@
   adc_inj_startconv(priv, enable);
 }
 
-#endif  /* ADC_HAVE_INJECTED */
+#endif /* ADC_HAVE_INJECTED */
 
 /****************************************************************************
  * Name: adc_llops_dumpregs
@@ -2657,7 +2657,7 @@
   adc_dumpregs(priv);
 }
 
-#endif  /* CONFIG_STM32L4_ADC_LL_OPS */
+#endif /* CONFIG_STM32L4_ADC_LL_OPS */
 
 /****************************************************************************
  * Public Functions
diff --git a/arch/arm/src/stm32l4/stm32l4_adc.h b/arch/arm/src/stm32l4/stm32l4_adc.h
index c3085f2..f90da52 100644
--- a/arch/arm/src/stm32l4/stm32l4_adc.h
+++ b/arch/arm/src/stm32l4/stm32l4_adc.h
@@ -582,7 +582,7 @@
   void (*dump_regs)(struct stm32_adc_dev_s *dev);
 };
 
-#endif  /* CONFIG_STM32L4_ADC_LL_OPS */
+#endif /* CONFIG_STM32L4_ADC_LL_OPS */
 
 /****************************************************************************
  * Public Function Prototypes
diff --git a/arch/mips/src/pic32mx/pic32mx_decodeirq.c b/arch/mips/src/pic32mx/pic32mx_decodeirq.c
index c6df933..ce4cf4c 100644
--- a/arch/mips/src/pic32mx/pic32mx_decodeirq.c
+++ b/arch/mips/src/pic32mx/pic32mx_decodeirq.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include  <debug.h>
+#include <debug.h>
 
 #include <stdint.h>
 #include <assert.h>
diff --git a/arch/mips/src/pic32mz/pic32mz_decodeirq.c b/arch/mips/src/pic32mz/pic32mz_decodeirq.c
index 879bc26..ec1f461 100644
--- a/arch/mips/src/pic32mz/pic32mz_decodeirq.c
+++ b/arch/mips/src/pic32mz/pic32mz_decodeirq.c
@@ -24,7 +24,7 @@
 
 #include <nuttx/config.h>
 
-#include  <debug.h>
+#include <debug.h>
 
 #include <stdint.h>
 #include <assert.h>
diff --git a/arch/risc-v/include/litex/irq.h b/arch/risc-v/include/litex/irq.h
index 6791927..22e4660 100644
--- a/arch/risc-v/include/litex/irq.h
+++ b/arch/risc-v/include/litex/irq.h
@@ -29,7 +29,7 @@
 #include CONFIG_LITEX_CUSTOM_IRQ_DEFINITIONS_PATH
 #else
 
-#include  <arch/mode.h>
+#include <arch/mode.h>
 
 /****************************************************************************
  * Pre-processor Definitions
diff --git a/arch/xtensa/src/esp32/esp32_wlan.c b/arch/xtensa/src/esp32/esp32_wlan.c
index e85aa35..823a5b5 100644
--- a/arch/xtensa/src/esp32/esp32_wlan.c
+++ b/arch/xtensa/src/esp32/esp32_wlan.c
@@ -1594,7 +1594,7 @@
 
   return ret;
 }
-#endif  /* CONFIG_NETDEV_IOCTL */
+#endif /* CONFIG_NETDEV_IOCTL */
 
 /****************************************************************************
  * Name: esp32_net_initialize
@@ -1923,4 +1923,4 @@
 }
 #endif /* ESP32_WLAN_HAS_SOFTAP */
 
-#endif  /* CONFIG_ESP32_WIFI */
+#endif /* CONFIG_ESP32_WIFI */
diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2s.c b/arch/xtensa/src/esp32s2/esp32s2_i2s.c
index 5ca9663..10e8bfd 100644
--- a/arch/xtensa/src/esp32s2/esp32s2_i2s.c
+++ b/arch/xtensa/src/esp32s2/esp32s2_i2s.c
@@ -356,12 +356,12 @@
 
 static const struct i2s_ops_s g_i2sops =
 {
-  #ifdef I2S_HAVE_TX
+#ifdef I2S_HAVE_TX
   .i2s_txchannels     = i2s_txchannels,
   .i2s_txsamplerate   = i2s_txsamplerate,
   .i2s_txdatawidth    = i2s_txdatawidth,
   .i2s_send           = i2s_send,
-  #endif /* I2S_HAVE_TX */
+#endif /* I2S_HAVE_TX */
 
 #ifdef I2S_HAVE_RX
   .i2s_rxchannels     = i2s_rxchannels,
diff --git a/arch/xtensa/src/esp32s3/esp32s3_wlan.c b/arch/xtensa/src/esp32s3/esp32s3_wlan.c
index c96994e..26b7b5c 100644
--- a/arch/xtensa/src/esp32s3/esp32s3_wlan.c
+++ b/arch/xtensa/src/esp32s3/esp32s3_wlan.c
@@ -1258,7 +1258,7 @@
 
   return ret;
 }
-#endif  /* CONFIG_NETDEV_IOCTL */
+#endif /* CONFIG_NETDEV_IOCTL */
 
 /****************************************************************************
  * Name: esp32s3_net_initialize
@@ -1595,4 +1595,4 @@
 }
 #endif /* ESP32S3_WLAN_HAS_SOFTAP */
 
-#endif  /* CONFIG_ESP32S3_WIFI */
+#endif /* CONFIG_ESP32S3_WIFI */
diff --git a/boards/arm/at32/at32f437-mini/src/at32_gpio.c b/boards/arm/at32/at32f437-mini/src/at32_gpio.c
index 6fe0fd1..1402e83 100644
--- a/boards/arm/at32/at32f437-mini/src/at32_gpio.c
+++ b/boards/arm/at32/at32f437-mini/src/at32_gpio.c
@@ -101,9 +101,9 @@
 #if (BOARD_NGPIOIN > 0)
 static const uint32_t g_gpioinputs[BOARD_NGPIOIN] =
     {
-#if 0      
+#if 0
       GPIO_IN1,
-#endif        
+#endif
 };
 
 static struct at32gpio_dev_s g_gpin[BOARD_NGPIOIN];
diff --git a/boards/arm/at32/at32f437-mini/src/at32_usb.c b/boards/arm/at32/at32f437-mini/src/at32_usb.c
index e79c653..99c481c 100644
--- a/boards/arm/at32/at32f437-mini/src/at32_usb.c
+++ b/boards/arm/at32/at32f437-mini/src/at32_usb.c
@@ -141,7 +141,7 @@
   at32_configgpio(GPIO_OTGFS_VBUS);
   at32_configgpio(GPIO_OTGFS_PWRON);
   at32_configgpio(GPIO_OTGFS_OVER);
-#endif  
+#endif
 
 #endif
 }
@@ -294,7 +294,7 @@
 
       at32_gpiowrite(GPIO_OTGFS_PWRON, true);
     }
-#endif    
+#endif
 }
 #endif
 
@@ -320,7 +320,7 @@
 {
 #ifdef CONFIG_AT32_OTGFS_VBUS_CONTROL  
   return at32_gpiosetevent(GPIO_OTGFS_OVER, true, true, true, handler, arg);
-#endif  
+#endif
 
   return 0;
 }
diff --git a/boards/arm/cxd56xx/common/src/cxd56_bmi160_scu.c b/boards/arm/cxd56xx/common/src/cxd56_bmi160_scu.c
index 8d384a8..ff9ad32 100644
--- a/boards/arm/cxd56xx/common/src/cxd56_bmi160_scu.c
+++ b/boards/arm/cxd56xx/common/src/cxd56_bmi160_scu.c
@@ -165,5 +165,5 @@
   return ret;
 }
 
-#endif  /* CONFIG_SENSORS_BMI160_SCU_SPI */
-#endif  /* CONFIG_SENSORS_BMI160_SCU */
+#endif /* CONFIG_SENSORS_BMI160_SCU_SPI */
+#endif /* CONFIG_SENSORS_BMI160_SCU */
diff --git a/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c b/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
index b52d16a..8be6586 100644
--- a/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
+++ b/boards/arm/cxd56xx/drivers/sensors/cxd5610_gnss.c
@@ -46,11 +46,11 @@
 
 #ifndef MIN
 #  define MIN(a,b)      (((a) < (b)) ? (a) : (b))
-#endif  /* MIN */
+#endif /* MIN */
 
 #ifndef MAX
 #  define MAX(a,b)      (((a) > (b)) ? (a) : (b))
-#endif  /* MAX */
+#endif /* MAX */
 
 /* Configurations */
 
diff --git a/boards/arm/cxd56xx/spresense/include/board_lcdpins.h b/boards/arm/cxd56xx/spresense/include/board_lcdpins.h
index 04cddfb..77a9308 100644
--- a/boards/arm/cxd56xx/spresense/include/board_lcdpins.h
+++ b/boards/arm/cxd56xx/spresense/include/board_lcdpins.h
@@ -143,4 +143,4 @@
 
 #endif
 
-#endif  /* __BOARDS_ARM_CXD56XX_SPRESENSE_INCLUDE_BOARD_LCDPINS_H */
+#endif /* __BOARDS_ARM_CXD56XX_SPRESENSE_INCLUDE_BOARD_LCDPINS_H */
diff --git a/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h b/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h
index 3a61112..1f78427 100644
--- a/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h
+++ b/boards/arm/imxrt/imxrt1064-evk/src/imxrt1064-evk.h
@@ -329,7 +329,7 @@
 
 #ifdef HAVE_PROGMEM_CHARDEV
 int imxrt_progmem_init(void);
-#endif  /* HAVE_PROGMEM_CHARDEV */
+#endif /* HAVE_PROGMEM_CHARDEV */
 #endif
 
 #endif /* __ASSEMBLY__ */
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_autoleds.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_autoleds.c
index 2588d42..63e5034 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_autoleds.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_autoleds.c
@@ -161,4 +161,4 @@
   imxrt_gpio_write(GPIO_LED, false);    /* Low illuminates */
 }
 
-#endif                                 /* CONFIG_ARCH_LEDS */
+#endif /* CONFIG_ARCH_LEDS */
diff --git a/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c b/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
index 08d580e..e6583b0 100644
--- a/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
+++ b/boards/arm/imxrt/teensy-4.x/src/imxrt_boot.c
@@ -115,4 +115,4 @@
 
   imxrt_bringup();
 }
-#endif                                 /* CONFIG_BOARD_LATE_INITIALIZE */
+#endif /* CONFIG_BOARD_LATE_INITIALIZE */
diff --git a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
index 94b9371..ca521b0 100644
--- a/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
+++ b/boards/arm/imxrt/teensy-4.x/src/teensy-4.h
@@ -268,5 +268,5 @@
 void imxrt_autoled_initialize(void);
 #endif
 
-#endif  /* __ASSEMBLY__ */
-#endif  /* __BOARDS_ARM_TEENSY_4X_SRC_TEENSY_4_H */
+#endif /* __ASSEMBLY__ */
+#endif /* __BOARDS_ARM_TEENSY_4X_SRC_TEENSY_4_H */
diff --git a/boards/arm/s32k1xx/rddrone-bms772/include/board.h b/boards/arm/s32k1xx/rddrone-bms772/include/board.h
index 0e7c40b..d9eb92e 100644
--- a/boards/arm/s32k1xx/rddrone-bms772/include/board.h
+++ b/boards/arm/s32k1xx/rddrone-bms772/include/board.h
@@ -147,4 +147,4 @@
 #define PIN_CAN0_RX       PIN_CAN0_RX_3      /* PTE4 */
 #define PIN_CAN0_TX       PIN_CAN0_TX_3      /* PTE5 */
 
-#endif  /* __BOARDS_ARM_S32K1XX_RDDRONE_BMS772_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_RDDRONE_BMS772_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/s32k118evb/include/board.h b/boards/arm/s32k1xx/s32k118evb/include/board.h
index a0061be..96ce4eb 100644
--- a/boards/arm/s32k1xx/s32k118evb/include/board.h
+++ b/boards/arm/s32k1xx/s32k118evb/include/board.h
@@ -129,4 +129,4 @@
 #define PIN_CAN0_RX       PIN_CAN0_RX_3      /* PTE4 */
 #define PIN_CAN0_TX       PIN_CAN0_TX_3      /* PTE5 */
 
-#endif  /* __BOARDS_ARM_S32K1XX_S32K118EVB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_S32K118EVB_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/s32k144evb/include/board.h b/boards/arm/s32k1xx/s32k144evb/include/board.h
index 49e956a..ec93b06 100644
--- a/boards/arm/s32k1xx/s32k144evb/include/board.h
+++ b/boards/arm/s32k1xx/s32k144evb/include/board.h
@@ -131,4 +131,4 @@
 #define PIN_CAN0_RX       PIN_CAN0_RX_3      /* PTE4 */
 #define PIN_CAN0_TX       PIN_CAN0_TX_3      /* PTE5 */
 
-#endif  /* __BOARDS_ARM_S32K1XX_S32K144EVB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_S32K144EVB_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/s32k146evb/include/board.h b/boards/arm/s32k1xx/s32k146evb/include/board.h
index 5ad7efe..6502328 100644
--- a/boards/arm/s32k1xx/s32k146evb/include/board.h
+++ b/boards/arm/s32k1xx/s32k146evb/include/board.h
@@ -131,4 +131,4 @@
 #define PIN_CAN0_RX       PIN_CAN0_RX_4      /* PTE4 */
 #define PIN_CAN0_TX       PIN_CAN0_TX_4      /* PTE5 */
 
-#endif  /* __BOARDS_ARM_S32K1XX_S32K146EVB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_S32K146EVB_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/s32k148evb/include/board.h b/boards/arm/s32k1xx/s32k148evb/include/board.h
index 82a2f36..1990dd9 100644
--- a/boards/arm/s32k1xx/s32k148evb/include/board.h
+++ b/boards/arm/s32k1xx/s32k148evb/include/board.h
@@ -131,4 +131,4 @@
 #define PIN_CAN0_RX       PIN_CAN0_RX_4      /* PTE4 */
 #define PIN_CAN0_TX       PIN_CAN0_TX_4      /* PTE5 */
 
-#endif  /* __BOARDS_ARM_S32K1XX_S32K148EVB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_S32K148EVB_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k1xx/ucans32k146/include/board.h b/boards/arm/s32k1xx/ucans32k146/include/board.h
index 3c49fba..3ac8a27 100644
--- a/boards/arm/s32k1xx/ucans32k146/include/board.h
+++ b/boards/arm/s32k1xx/ucans32k146/include/board.h
@@ -158,4 +158,4 @@
 #define PIN_CAN1_TX       PIN_CAN1_TX_1      /* PTA13 */
 #define PIN_CAN1_STB      (PIN_PTE10 | GPIO_OUTPUT)
 
-#endif  /* __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K1XX_UCANS32K146_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k3xx/mr-canhubk3/include/board.h b/boards/arm/s32k3xx/mr-canhubk3/include/board.h
index 0c59590..be0c9a2 100644
--- a/boards/arm/s32k3xx/mr-canhubk3/include/board.h
+++ b/boards/arm/s32k3xx/mr-canhubk3/include/board.h
@@ -321,4 +321,4 @@
 #define PIN_EMAC_MII_RMII_MDIO    PIN_EMAC_MII_RMII_MDIO_2     /* PTD16 */
 #define PIN_EMAC_MII_RMII_TX_CLK  PIN_EMAC_MII_RMII_TX_CLK_2   /* PTD6 */
 
-#endif  /* __BOARDS_ARM_S32K3XX_MR_CANHUBK3_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K3XX_MR_CANHUBK3_INCLUDE_BOARD_H */
diff --git a/boards/arm/s32k3xx/s32k344evb/include/board.h b/boards/arm/s32k3xx/s32k344evb/include/board.h
index a6d8d06..b018963 100644
--- a/boards/arm/s32k3xx/s32k344evb/include/board.h
+++ b/boards/arm/s32k3xx/s32k344evb/include/board.h
@@ -165,4 +165,4 @@
 #define PIN_CAN0_TX       PIN_CAN0_TX_1      /* PTA7 */
 #define PIN_CAN0_RX       PIN_CAN0_RX_1      /* PTA6 */
 
-#endif  /* __BOARDS_ARM_S32K3XX_S32K344EVB_INCLUDE_BOARD_H */
+#endif /* __BOARDS_ARM_S32K3XX_S32K344EVB_INCLUDE_BOARD_H */
diff --git a/boards/arm/sama5/giant-board/include/board_492mhz.h b/boards/arm/sama5/giant-board/include/board_492mhz.h
index 9e3068e..fab4e89 100644
--- a/boards/arm/sama5/giant-board/include/board_492mhz.h
+++ b/boards/arm/sama5/giant-board/include/board_492mhz.h
@@ -204,4 +204,4 @@
 #endif
 
 #endif /* !__ASSEMBLY__ */
-#endif  /* __BOARDS_ARM_SAMA5_GIANT_BOARD_INCLUDE_BOARD_492MHZ_H */
+#endif /* __BOARDS_ARM_SAMA5_GIANT_BOARD_INCLUDE_BOARD_492MHZ_H */
diff --git a/boards/arm/sama5/jupiter-nano/include/board_498mhz.h b/boards/arm/sama5/jupiter-nano/include/board_498mhz.h
index e0dff14..85a1e19 100644
--- a/boards/arm/sama5/jupiter-nano/include/board_498mhz.h
+++ b/boards/arm/sama5/jupiter-nano/include/board_498mhz.h
@@ -203,4 +203,4 @@
 #endif
 
 #endif /* !__ASSEMBLY__ */
-#endif  /* __BOARDS_ARM_SAMA5_JUPITER_NANO_INCLUDE_BOARD_498MHZ_H */
+#endif /* __BOARDS_ARM_SAMA5_JUPITER_NANO_INCLUDE_BOARD_498MHZ_H */
diff --git a/boards/arm/stm32/b-g431b-esc1/include/board.h b/boards/arm/stm32/b-g431b-esc1/include/board.h
index 7a32696..24a4a44 100644
--- a/boards/arm/stm32/b-g431b-esc1/include/board.h
+++ b/boards/arm/stm32/b-g431b-esc1/include/board.h
@@ -122,7 +122,7 @@
 #define STM32_RCC_CFGR_PPRE2           RCC_CFGR_PPRE2_HCLK
 #define STM32_PCLK2_FREQUENCY          STM32_HCLK_FREQUENCY
 
-#endif  /* CONFIG_BOARD_STM32_BG431BESC1_USE_HSI */
+#endif /* CONFIG_BOARD_STM32_BG431BESC1_USE_HSI */
 
 #ifdef CONFIG_BOARD_STM32_BG431BESC1_USE_HSE
 
@@ -206,7 +206,7 @@
 #define STM32_RCC_CFGR_PPRE2           RCC_CFGR_PPRE2_HCLK
 #define STM32_PCLK2_FREQUENCY          STM32_HCLK_FREQUENCY
 
-#endif  /* CONFIG_BOARD_STM32_BG431BESC1_USE_HSE */
+#endif /* CONFIG_BOARD_STM32_BG431BESC1_USE_HSE */
 
 /* APB2 timers 1, 8, 20 and 15-17 will receive PCLK2. */
 
diff --git a/boards/arm/stm32/nucleo-f103rb/include/board.h b/boards/arm/stm32/nucleo-f103rb/include/board.h
index fb790f6..91953bb 100644
--- a/boards/arm/stm32/nucleo-f103rb/include/board.h
+++ b/boards/arm/stm32/nucleo-f103rb/include/board.h
@@ -207,6 +207,6 @@
 #  define GPIO_FOC_DEBUG3 (GPIO_OUTPUT|GPIO_CNF_OUTPP|GPIO_MODE_50MHz| \
                            GPIO_OUTPUT_CLEAR|GPIO_PORTC|GPIO_PIN5)
 
-#endif  /* CONFIG_BOARD_STM32_IHM07M1 */
+#endif /* CONFIG_BOARD_STM32_IHM07M1 */
 
 #endif /* __BOARDS_ARM_STM32_NUCLEO_F103RB_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32/nucleo-g431kb/src/stm32_dac.c b/boards/arm/stm32/nucleo-g431kb/src/stm32_dac.c
index 1040a8b..bf7c230 100644
--- a/boards/arm/stm32/nucleo-g431kb/src/stm32_dac.c
+++ b/boards/arm/stm32/nucleo-g431kb/src/stm32_dac.c
@@ -109,4 +109,4 @@
   return OK;
 }
 
-#endif  /* CONFIG_DAC */
+#endif /* CONFIG_DAC */
diff --git a/boards/arm/stm32/nucleo-g431rb/include/board.h b/boards/arm/stm32/nucleo-g431rb/include/board.h
index a4580b7..1ee50d3 100644
--- a/boards/arm/stm32/nucleo-g431rb/include/board.h
+++ b/boards/arm/stm32/nucleo-g431rb/include/board.h
@@ -122,7 +122,7 @@
 #define STM32_RCC_CFGR_PPRE2           RCC_CFGR_PPRE2_HCLK
 #define STM32_PCLK2_FREQUENCY          STM32_HCLK_FREQUENCY
 
-#endif  /* CONFIG_BOARD_NUCLEO_G431RB_USE_HSI */
+#endif /* CONFIG_BOARD_NUCLEO_G431RB_USE_HSI */
 
 #ifdef CONFIG_BOARD_NUCLEO_G431RB_USE_HSE
 
@@ -206,7 +206,7 @@
 #define STM32_RCC_CFGR_PPRE2           RCC_CFGR_PPRE2_HCLK
 #define STM32_PCLK2_FREQUENCY          STM32_HCLK_FREQUENCY
 
-#endif  /* CONFIG_BOARD_NUCLEO_G431RB_USE_HSE */
+#endif /* CONFIG_BOARD_NUCLEO_G431RB_USE_HSE */
 
 /* APB2 timers 1, 8, 20 and 15-17 will receive PCLK2. */
 
@@ -392,6 +392,6 @@
 #  define GPIO_FOC_DEBUG3 (GPIO_OUTPUT|GPIO_PUSHPULL|GPIO_SPEED_50MHz| \
                            GPIO_OUTPUT_CLEAR|GPIO_PORTA|GPIO_PIN12)
 
-#endif  /* CONFIG_BOARD_STM32_IHM16M1 */
+#endif /* CONFIG_BOARD_STM32_IHM16M1 */
 
 #endif /* __BOARDS_ARM_STM32_NUCLEO_G431RB_INCLUDE_BOARD_H */
diff --git a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
index 51fecd3..fe6cdb7 100644
--- a/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
+++ b/boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
@@ -388,7 +388,7 @@
 
 #ifdef HAVE_PROGMEM_CHARDEV
 int stm32_progmem_init(void);
-#endif  /* HAVE_PROGMEM_CHARDEV */
+#endif /* HAVE_PROGMEM_CHARDEV */
 #endif
 
 /****************************************************************************
diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
index d876870..e650345 100644
--- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_bringup.c
@@ -368,7 +368,7 @@
     }
 #endif /* CONFIG_AUDIO_ES8388 */
 
-#endif  /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESP32_I2S0 */
 
 #ifdef CONFIG_ESP32_I2S1
 
@@ -381,7 +381,7 @@
              CONFIG_ESP32_I2S0, ret);
     }
 
-#endif  /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESP32_I2S1 */
 
 #endif /* CONFIG_ESP32_I2S */
 
diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
index cf023e0..dd384b1 100644
--- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32_bringup.c
@@ -550,7 +550,7 @@
 
 #endif /* CONFIG_AUDIO_CS4344 */
 
-#endif  /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESP32_I2S0 */
 
 #ifdef CONFIG_ESP32_I2S1
 
@@ -575,7 +575,7 @@
              CONFIG_ESP32_I2S1, ret);
     }
 
-#endif  /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESP32_I2S1 */
 
 #endif /* CONFIG_ESP32_I2S */
 
diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
index eeb3959..44a995f 100644
--- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32_bringup.c
@@ -368,7 +368,7 @@
     }
 #endif /* CONFIG_AUDIO_ES8388 */
 
-#endif  /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESP32_I2S0 */
 
 #ifdef CONFIG_ESP32_I2S1
 
@@ -381,7 +381,7 @@
              CONFIG_ESP32_I2S0, ret);
     }
 
-#endif  /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESP32_I2S1 */
 
 #endif /* CONFIG_ESP32_I2S */
 
diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
index 95974cd..9008c56 100644
--- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
+++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_bringup.c
@@ -388,7 +388,7 @@
              CONFIG_ESP32_I2S0, ret);
     }
 
-#endif  /* CONFIG_ESP32_I2S0 */
+#endif /* CONFIG_ESP32_I2S0 */
 
 #ifdef CONFIG_ESP32_I2S1
 
@@ -413,7 +413,7 @@
              CONFIG_ESP32_I2S1, ret);
     }
 
-#endif  /* CONFIG_ESP32_I2S1 */
+#endif /* CONFIG_ESP32_I2S1 */
 
 #endif /* CONFIG_ESP32_I2S */
 
diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
index 51e8c84..fca474d 100644
--- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
+++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_bringup.c
@@ -316,7 +316,7 @@
              CONFIG_ESP32S3_I2S1, ret);
     }
 
-#endif  /* CONFIG_ESP32S3_I2S1 */
+#endif /* CONFIG_ESP32S3_I2S1 */
 
 #endif /* CONFIG_ESP32S3_I2S */
 
diff --git a/drivers/audio/wm8994.h b/drivers/audio/wm8994.h
index e59e20c..561a9e3 100644
--- a/drivers/audio/wm8994.h
+++ b/drivers/audio/wm8994.h
@@ -1610,9 +1610,9 @@
 #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
 #ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
   uint16_t                balance;          /* Current balance level (b16) */
-#endif  /* CONFIG_AUDIO_EXCLUDE_BALANCE */
+#endif /* CONFIG_AUDIO_EXCLUDE_BALANCE */
   uint8_t                 volume;           /* Current volume level {0..63} */
-#endif  /* CONFIG_AUDIO_EXCLUDE_VOLUME */
+#endif /* CONFIG_AUDIO_EXCLUDE_VOLUME */
   uint8_t                 nchannels;        /* Number of channels (1 or 2) */
   uint8_t                 bpsamp;           /* Bits per sample (8 or 16) */
   volatile uint8_t        inflight;         /* Number of audio buffers in-flight */
diff --git a/drivers/modem/alt1250/alt1250.h b/drivers/modem/alt1250/alt1250.h
index 5f46bf4..10b962f 100644
--- a/drivers/modem/alt1250/alt1250.h
+++ b/drivers/modem/alt1250/alt1250.h
@@ -56,4 +56,4 @@
 uint64_t get_event_lapibuffer(FAR struct alt1250_dev_s *dev,
   uint32_t lapicmdid, alt_evtbuf_inst_t **inst);
 
-#endif  /* __DRIVERS_MODEM_ALT1250_ALT1250_H */
+#endif /* __DRIVERS_MODEM_ALT1250_ALT1250_H */
diff --git a/sched/sched/sched_get_stackinfo.c b/sched/sched/sched_get_stackinfo.c
index 4dde84a..01c7ef5 100644
--- a/sched/sched/sched_get_stackinfo.c
+++ b/sched/sched/sched_get_stackinfo.c
@@ -61,7 +61,7 @@
 
   DEBUGASSERT(rtcb != NULL && stackinfo != NULL);
 
-  /*  Pid of 0 means that we are querying ourself */
+  /* Pid of 0 means that we are querying ourself */
 
   if (pid == 0)
     {
diff --git a/sched/task/task_exit.c b/sched/task/task_exit.c
index e7ea92a..02a5c83 100644
--- a/sched/task/task_exit.c
+++ b/sched/task/task_exit.c
@@ -22,11 +22,11 @@
  * Included Files
  ****************************************************************************/
 
-#include  <nuttx/config.h>
+#include <nuttx/config.h>
 
-#include  <sched.h>
+#include <sched.h>
 
-#include  "sched/sched.h"
+#include "sched/sched.h"
 
 #ifdef CONFIG_SMP
 #  include "irq/irq.h"
diff --git a/tools/kconfig2html.c b/tools/kconfig2html.c
index f815bad..422f292 100644
--- a/tools/kconfig2html.c
+++ b/tools/kconfig2html.c
@@ -196,7 +196,8 @@
 static int g_choice_number;
 static int g_toggle_number;
 
-static const char g_delimiters[] = " ,";
+static const char g_delimiters[] =
+" ,";
 
 static struct reserved_s g_reserved[] =
 {
@@ -225,7 +226,7 @@
   {TOKEN_SOURCE,     "source"},
   {TOKEN_IF,         "if"},
   {TOKEN_ENDIF,      "endif"},
-  {TOKEN_NOTRESERVED, NULL}   /* Terminates list */
+  {TOKEN_NOTRESERVED, NULL}
 };
 
 /****************************************************************************
@@ -898,7 +899,7 @@
 
   if (*pbegin == '"')
     {
-      /*  Search for the trailing quotation mark */
+      /* Search for the trailing quotation mark */
 
       pend = findchar(pbegin + 1, '"');
 
@@ -1869,7 +1870,8 @@
 
   if (config.c_select.s_nvar > 0)
     {
-      outfunc("  <li><i>Selects</i>: <a href=\"#CONFIG_%s\"><code>CONFIG_%s</code></a>",
+      outfunc("  <li><i>Selects</i>: <a href=\"#CONFIG_%s\">"
+              "<code>CONFIG_%s</code></a>",
               config.c_select.s_varname[0], config.c_select.s_varname[0]);
 
       for (i = 1; i < config.c_select.s_nvar; i++)
@@ -2168,14 +2170,16 @@
   paranum = get_paranum();
   if (menu.m_name)
     {
-      output("<li><a name=\"menu_%d_toc\"><a href=\"#menu_%d\">%s Menu: %s</a></a></li>\n",
+      output("<li><a name=\"menu_%d_toc\">"
+             "<a href=\"#menu_%d\">%s Menu: %s</a></a></li>\n",
              g_menu_number, g_menu_number, paranum, menu.m_name);
       body("\n<h1><a name=\"menu_%d\">%s Menu: %s</a></h1>\n",
            g_menu_number, paranum, menu.m_name);
     }
   else
     {
-      output("<li><a name=\"menu_%d_toc\"><a href=\"#menu_%d\">%s Menu</a></a></li>\n",
+      output("<li><a name=\"menu_%d_toc\">"
+             "<a href=\"#menu_%d\">%s Menu</a></a></li>\n",
              g_menu_number, g_menu_number, paranum);
       body("\n<h1><a name=\"menu_%d\">%s Menu</a></h1>\n",
              g_menu_number, paranum);
@@ -2186,10 +2190,13 @@
    */
 
 #ifdef USE_JQUERY
-  output("<a id=\"link_%d\" href=\"#menu_%d_toc\" onclick=\"toggle('toggle_%d', 'link_%d')\">Expand</a>\n",
+  output("<a id=\"link_%d\" "
+         "href=\"#menu_%d_toc\" onclick=\"toggle('toggle_%d', 'link_%d')\">"
+         "Expand</a>\n",
          g_menu_number, g_toggle_number, g_toggle_number);
 #else
-  output("<a href=\"#menu_%d_toc\" onclick=\"toggle('toggle_%d', this)\">Expand</a>\n",
+  output("<a href=\"#menu_%d_toc\" onclick=\"toggle('toggle_%d', this)\">"
+         "Expand</a>\n",
          g_menu_number, g_toggle_number);
 #endif
   output("<ul id=\"toggle_%d\"  style=\"display:none\">\n",
@@ -2293,17 +2300,20 @@
 
                               *appsdir = '\0';
                               asprintf(&dirpath, "%s/%s%s%s",
-                                       g_kconfigroot, subdir, g_appsdir, tmp);
+                                       g_kconfigroot, subdir,
+                                       g_appsdir, tmp);
                             }
                           else
                             {
-                              asprintf(&dirpath, "%s/%s", g_kconfigroot, subdir);
+                              asprintf(&dirpath, "%s/%s",
+                                       g_kconfigroot, subdir);
                             }
                         }
 
                       configname = strdup(configname);
 
-                      debug("parse_kconfigfile: Recursing for TOKEN_SOURCE\n");
+                      debug("parse_kconfigfile: "
+                            "Recursing for TOKEN_SOURCE\n");
                       debug("  source:      %s\n", source);
                       debug("  subdir:      %s\n", subdir);
                       debug("  dirpath:     %s\n", dirpath);
@@ -2317,8 +2327,8 @@
                       free(configname);
                     }
 
-                  /* Set the token string to NULL to indicate that we need to read
-                   * the next line
+                  /* Set the token string to NULL to indicate that
+                   * we need to read the next line
                    */
 
                   token = NULL;
@@ -2371,8 +2381,8 @@
               case TOKEN_ENDMENU:
                 {
                   /* Reduce table of contents indentation level.  NOTE that
-                   * this also terminates the toggle block that began with the
-                   * matching <ul>
+                   * this also terminates the toggle block that
+                   * began with the matching <ul>
                    */
 
                   output("</ul>\n");
@@ -2588,14 +2598,16 @@
   output("<table width =\"100%%\">\n");
   output("<tr align=\"center\" bgcolor=\"#e4e4e4\">\n");
   output("<td>\n");
-  output("<h1><big><font color=\"#3c34ec\"><i>NuttX Configuration Variables</i></font></big></h1>\n");
+  output("<h1><big><font color=\"#3c34ec\">"
+         "<i>NuttX Configuration Variables</i></font></big></h1>\n");
   output("<p>Last Updated: %s</p>\n", g_scratch);
   output("</td>\n");
   output("</tr>\n");
   output("</table>\n");
 
 #ifdef USE_JQUERY
-  output("<script src=\"http://code.jquery.com/jquery-1.9.1.js\"></script>\n");
+  output("<script src=\"http://code.jquery.com/jquery-1.9.1.js\">"
+         "</script>\n");
   output("<script type=\"text/javascript\">\n");
   output("function toggle(list_id, link_id) {\n");
   output("  var list = $('#' + list_id);\n");
@@ -2661,24 +2673,39 @@
   body("<p>\n");
   body("  <b>Overview</b>.\n");
   body("  The NuttX RTOS is highly configurable.\n");
-  body("  The NuttX configuration files are maintained using the <a href=\"https://bitbucket.org/nuttx/tools/src/master/kconfig-frontends\">kconfig-frontends</a> tool.\n");
-  body("  That configuration tool uses <code>Kconfig</code> files that can be found through the NuttX source tree.\n");
-  body("  Each <code>Kconfig</code> files contains declarations of configuration variables.\n");
-  body("  Each configuration variable provides one configuration option for the NuttX RTOS.\n");
+  body("  The NuttX configuration files are maintained using the "
+       "kconfig-frontends</a> tool.\n");
+  body("  That configuration tool uses <code>Kconfig</code> "
+       "files that can be found through the NuttX source tree.\n");
+  body("  Each <code>Kconfig</code> files contains "
+       "declarations of configuration variables.\n");
+  body("  Each configuration variable provides one configuration "
+       "option for the NuttX RTOS.\n");
   body("  This configurable options are described in this document.\n");
   body("</p>\n");
   body("<p>\n");
   body("  <b>Main Menu</b>.\n");
-  body("  The normal way to start the NuttX configuration is to enter this command line from the NuttX build directory: <code>make menuconfig</code>.\n");
-  body("  Note that NuttX must first be configured <i>before</i> this command so that the configuration file (<code>.config</code>) is present in the top-level build directory.\n");
-  body("  The main menu is the name give to the opening menu display after this command is executed.\n");
+  body("  The normal way to start the NuttX configuration is to enter "
+       "this command line from the NuttX build directory: "
+       "<code>make menuconfig</code>.\n");
+  body("  Note that NuttX must first be configured <i>before</i> "
+       "this command so that the configuration file (<code>.config</code>) "
+       "is present in the top-level build directory.\n");
+  body("  The main menu is the name give to the opening menu display "
+       "after this command is executed.\n");
   body("</p>\n");
   body("<p>\n");
   body("  <b>Maintenance Note</b>.\n");
-  body("  This documentation was auto-generated using the <a href=\"https://bitbucket.org/nuttx/nuttx/src/master/tools/kconfig2html.c\">kconfig2html</a> tool\n");
-  body("  That tool analyzes the NuttX <code>Kconfig</code> files and generates this HTML document.\n");
+  body("  This documentation was auto-generated using the "
+       "kconfig2html tool\n");
+  body("  That tool analyzes the NuttX <code>Kconfig</code> "
+       "files and generates this HTML document.\n");
   body("  This HTML document file should not be edited manually.\n");
-  body("  In order to make changes to this document, you should instead modify the <code>Kconfig</code> file(s) that were used to generated this document and then execute the <code>kconfig2html</code> again to regenerate the HTML document file.\n");
+  body("  In order to make changes to this document, "
+       "you should instead modify the <code>Kconfig</code> file(s) "
+       "that were used to generated this document and then execute the "
+       "<code>kconfig2html</code> again "
+       "to regenerate the HTML document file.\n");
   body("</p>\n");
 
   /* Process the Kconfig files through recursive descent */
@@ -2687,7 +2714,8 @@
 
   /* Terminate the table of contents */
 
-  output("<li><a href=\"#appendixa\">Appendix A: Hidden Configuration Variables</a></li>\n");
+  output("<li><a href=\"#appendixa\">"
+         "Appendix A: Hidden Configuration Variables</a></li>\n");
   output("</ul>\n");
 
   /* Close the HMTL body file and copy it to the output file */
@@ -2700,17 +2728,28 @@
   output("<table width =\"100%%\">\n");
   output("  <tr bgcolor=\"#e4e4e4\">\n");
   output("  <td>\n");
-  output("    <a name=\"appendixa\"><h1>Appendix A: Hidden Configuration Variables</h1></a>\n");
+  output("    <a name=\"appendixa\">"
+         "<h1>Appendix A: Hidden Configuration Variables</h1></a>\n");
   output("  </td>\n");
   output("  </tr>\n");
   output("</table>\n");
 
   output("<p>\n");
-  output("  This appendix holds internal configurations variables that are not visible to the user.\n");
-  output("  These settings are presented out-of-context because they cannot be directly controlled by the user.\n");
-  output("  Many of these settings are selected automatically and indirectly when other, visible configuration variables are selected.\n");
-  output("  One purpose of these hidden configuration variables is to control menuing in the kconfig-frontends configuration tool.\n");
-  output("  Many configuration variables with a form like <code>CONFIG_ARCH_HAVE_</code><i>feature</i>, for example, are used only to indicate that the selected architecture supports <i>feature</i> and so addition selection associated with <i>feature</i> will become accessible to the user.\n");
+  output("  This appendix holds internal configurations variables that "
+         "are not visible to the user.\n");
+  output("  These settings are presented out-of-context because "
+         "they cannot be directly controlled by the user.\n");
+  output("  Many of these settings are selected automatically and "
+         "indirectly when other, visible configuration variables "
+         "are selected.\n");
+  output("  One purpose of these hidden configuration variables "
+         "is to control menuing in the kconfig-frontends "
+         "configuration tool.\n");
+  output("  Many configuration variables with a form like "
+         "<code>CONFIG_ARCH_HAVE_</code><i>feature</i>, for example, "
+         "are used only to indicate that the selected architecture supports "
+         "<i>feature</i> and so addition selection associated with "
+         "<i>feature</i> will become accessible to the user.\n");
   output("</p>\n");
   output("<ul>\n");
 
diff --git a/tools/nxstyle.c b/tools/nxstyle.c
index 4652a3e..bce1c63 100644
--- a/tools/nxstyle.c
+++ b/tools/nxstyle.c
@@ -1924,7 +1924,7 @@
                    strncmp(&line[indent], "goto ", 5) == 0 ||
                    strncmp(&line[indent], "if ", 3) == 0 ||
                    strncmp(&line[indent], "return ", 7) == 0 ||
-    #if 0 /*  Doesn't follow pattern */
+    #if 0 /* Doesn't follow pattern */
                    strncmp(&line[indent], "switch ", 7) == 0 ||
     #endif
                    strncmp(&line[indent], "while ", 6) == 0)