diff --git a/boards/arm/kl/teensy-lc/include/board.h b/boards/arm/kl/teensy-lc/include/board.h
index b7eb3a19b0..0c9eb87ea8 100644
--- a/boards/arm/kl/teensy-lc/include/board.h
+++ b/boards/arm/kl/teensy-lc/include/board.h
@@ -83,22 +83,22 @@
 
 /* TPM0 Channels */
 
-#define GPIO_TPM0_CH0OUT PIN_TPM0_CH0_2  // Pin 22: PTC1
-#define GPIO_TPM0_CH1OUT PIN_TPM0_CH1_2  // Pin 23: PTC2
-#define GPIO_TPM0_CH2OUT PIN_TPM0_CH2_2  // Pin  9: PTC3
-#define GPIO_TPM0_CH3OUT PIN_TPM0_CH3_1  // Pin 10: PTC4
-#define GPIO_TPM0_CH4OUT PIN_TPM0_CH4_2  // Pin  6: PTD4
-#define GPIO_TPM0_CH5OUT PIN_TPM0_CH5_3  // Pin 20: PTD5
+#define GPIO_TPM0_CH0OUT PIN_TPM0_CH0_2  /* Pin 22: PTC1 */
+#define GPIO_TPM0_CH1OUT PIN_TPM0_CH1_2  /* Pin 23: PTC2 */
+#define GPIO_TPM0_CH2OUT PIN_TPM0_CH2_2  /* Pin  9: PTC3 */
+#define GPIO_TPM0_CH3OUT PIN_TPM0_CH3_1  /* Pin 10: PTC4 */
+#define GPIO_TPM0_CH4OUT PIN_TPM0_CH4_2  /* Pin  6: PTD4 */
+#define GPIO_TPM0_CH5OUT PIN_TPM0_CH5_3  /* Pin 20: PTD5 */
 
 /* TPM1 Channels */
 
-#define GPIO_TPM1_CH0OUT PIN_TPM1_CH0_2  // Pin 16: PTB0
-#define GPIO_TPM1_CH1OUT PIN_TPM1_CH1_2  // Pin 17: PTB1
+#define GPIO_TPM1_CH0OUT PIN_TPM1_CH0_2  /* Pin 16: PTB0 */
+#define GPIO_TPM1_CH1OUT PIN_TPM1_CH1_2  /* Pin 17: PTB1 */
 
 /* TPM2 Channels */
 
-#define GPIO_TPM2_CH0OUT PIN_TPM2_CH0_1  // Pin  3: PTA1
-#define GPIO_TPM2_CH1OUT PIN_TPM2_CH1_1  // Pin  4: PTA2
+#define GPIO_TPM2_CH0OUT PIN_TPM2_CH0_1  /* Pin  3: PTA1 */
+#define GPIO_TPM2_CH1OUT PIN_TPM2_CH1_1  /* Pin  4: PTA2 */
 
 /* LED definitions **********************************************************/
 
@@ -122,12 +122,12 @@
  * LED.  Use pin 14 instead.
  */
 
-#define PIN_SPI0_SCK   (PIN_SPI0_SCK_3 | PIN_ALT2_PULLUP)  // Pin 14: PTD1
-#define PIN_SPI0_MISO  (PIN_SPI0_MISO_4 | PIN_ALT2_PULLUP) // Pin 12: PTC7
-#define PIN_SPI0_MOSI  (PIN_SPI0_MOSI_3 | PIN_ALT2_PULLUP) // Pin 11: PTC6
+#define PIN_SPI0_SCK   (PIN_SPI0_SCK_3 | PIN_ALT2_PULLUP)  /* Pin 14: PTD1 */
+#define PIN_SPI0_MISO  (PIN_SPI0_MISO_4 | PIN_ALT2_PULLUP) /* Pin 12: PTC7 */
+#define PIN_SPI0_MOSI  (PIN_SPI0_MOSI_3 | PIN_ALT2_PULLUP) /* Pin 11: PTC6 */
 
-#define PIN_SPI1_SCK   (PIN_SPI1_SCK_2 | PIN_ALT2_PULLUP)  // Pin 20: PTD5
-#define PIN_SPI1_MISO  (PIN_SPI1_MISO_2 | PIN_ALT2_PULLUP) // Pin 1: PTB17
-#define PIN_SPI1_MOSI  (PIN_SPI0_MOSI_1 | PIN_ALT2_PULLUP) // Pin 0: PTB16
+#define PIN_SPI1_SCK   (PIN_SPI1_SCK_2 | PIN_ALT2_PULLUP)  /* Pin 20: PTD5 */
+#define PIN_SPI1_MISO  (PIN_SPI1_MISO_2 | PIN_ALT2_PULLUP) /* Pin 1: PTB17 */
+#define PIN_SPI1_MOSI  (PIN_SPI0_MOSI_1 | PIN_ALT2_PULLUP) /* Pin 0: PTB16 */
 
 #endif /* __BOARDS_ARM_KL_TEENSY_LC_INCLUDE_BOARD_H */
diff --git a/boards/arm/phy62xx/phy6222/src/bringup.c b/boards/arm/phy62xx/phy6222/src/bringup.c
index b315340533..1e40688dc9 100644
--- a/boards/arm/phy62xx/phy6222/src/bringup.c
+++ b/boards/arm/phy62xx/phy6222/src/bringup.c
@@ -65,8 +65,8 @@ extern int phyplus_timer_initialize(const char *devpath, int timer);
  *     Called from the NSH library
  *
  ****************************************************************************/
-#define PPLUS_MTD_START_OFFSET  0x60000   //start from 384k offset
-#define PPLUS_MTD_SIZE          0x20000   //mtd size is 128k bytes
+#define PPLUS_MTD_START_OFFSET  0x60000  /* start from 384k offset */
+#define PPLUS_MTD_SIZE          0x20000  /* mtd size is 128k bytes */
 
 int phy62xx_bringup(void)
 {
diff --git a/drivers/sensors/ak09912.c b/drivers/sensors/ak09912.c
index fbe91bbeec..2c2c910265 100644
--- a/drivers/sensors/ak09912.c
+++ b/drivers/sensors/ak09912.c
@@ -85,7 +85,7 @@
  * The unit is 10 millisecond.
  */
 
-#define AK09912_POLLING_TIMEOUT (1)  // 10 ms
+#define AK09912_POLLING_TIMEOUT (1)  /* 10 ms */
 
 /* The parameter for compensating. */
 
diff --git a/drivers/video/mipidsi/mipi_dsi_device.c b/drivers/video/mipidsi/mipi_dsi_device.c
index 10b8db4b05..2cf6aca456 100644
--- a/drivers/video/mipidsi/mipi_dsi_device.c
+++ b/drivers/video/mipidsi/mipi_dsi_device.c
@@ -1031,7 +1031,7 @@ mipi_dsi_device_register(FAR struct mipi_dsi_host *host,
           kmm_free(dev);
           dev = NULL;
         }
-#endif // CONFIG_MIPI_DSI_DRIVER
+#endif /* CONFIG_MIPI_DSI_DRIVER */
     }
 
   return dev;