diff --git a/arch/arm/src/stm32/hardware/stm32g4xxxx_dmamux.h b/arch/arm/src/stm32/hardware/stm32g4xxxx_dmamux.h
index e547d8d219..2714fc2a52 100644
--- a/arch/arm/src/stm32/hardware/stm32g4xxxx_dmamux.h
+++ b/arch/arm/src/stm32/hardware/stm32g4xxxx_dmamux.h
@@ -33,7 +33,7 @@
 
 /* DMAMUX1 mapping ******************************************************************/
 
-/* For category 3 and category 4 devies:
+/* For category 3 and category 4 devices:
  *       DMAMUX1 channels 0 to 7 are connected to DMA1 channels 1 to 8.
  *       DMAMUX1 channels 8 to 15 are connected to DMA2 channels 1 to 8.
  *
diff --git a/arch/arm/src/stm32/stm32_dma2d.h b/arch/arm/src/stm32/stm32_dma2d.h
index 86cc6856cb..7ff181351a 100644
--- a/arch/arm/src/stm32/stm32_dma2d.h
+++ b/arch/arm/src/stm32/stm32_dma2d.h
@@ -86,8 +86,8 @@ struct dma2d_layer_s
    *
    * Description:
    *   Fill a specific memory region with a color.
-   *   The caller must ensure that the memory region (area) is within the entire
-   *   overlay.
+   *   The caller must ensure that the memory region (area) is within the
+   *   entire overlay.
    *
    * Parameter:
    *   oinfo  - Reference to overlay information
@@ -106,9 +106,9 @@ struct dma2d_layer_s
    *
    * Description:
    *   Copies memory from a source overlay (defined by sarea) to destination
-   *   overlay position (defined by destxpos and destypos) without pixelformat
-   *   conversion. The caller must ensure that the memory region (area) is
-   *   within the entire overlay.
+   *   overlay position (defined by destxpos and destypos) without
+   *   pixelformat conversion. The caller must ensure that the memory region
+   *   (area) is within the entire overlay.
    *
    * Parameter:
    *   doverlay - Reference destination overlay
@@ -159,7 +159,7 @@ struct dma2d_layer_s
 };
 
 /****************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ****************************************************************************/
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_fmc.h b/arch/arm/src/stm32/stm32_fmc.h
index 47294611fa..8df79ac0a8 100644
--- a/arch/arm/src/stm32/stm32_fmc.h
+++ b/arch/arm/src/stm32/stm32_fmc.h
@@ -46,7 +46,7 @@
 #include "hardware/stm32_fmc.h"
 
 /****************************************************************************
- * Public Functions
+ * Public Function Prototypes
  ****************************************************************************/
 
 #ifndef __ASSEMBLY__
diff --git a/arch/arm/src/stm32/stm32_freerun.h b/arch/arm/src/stm32/stm32_freerun.h
index b263367d16..c871bb8c37 100644
--- a/arch/arm/src/stm32/stm32_freerun.h
+++ b/arch/arm/src/stm32/stm32_freerun.h
@@ -55,9 +55,9 @@
  ****************************************************************************/
 
 /* The freerun client must allocate an instance of this structure and called
- * stm32_freerun_initialize() before using the freerun facilities.  The client
- * should not access the contents of this structure directly since the
- * contents are subject to change.
+ * stm32_freerun_initialize() before using the freerun facilities.  The
+ * client should not access the contents of this structure directly since
+ * the contents are subject to change.
  */
 
 struct stm32_freerun_s
diff --git a/arch/arm/src/stm32/stm32_pm.h b/arch/arm/src/stm32/stm32_pm.h
index e8d43aa165..bd7f273b87 100644
--- a/arch/arm/src/stm32/stm32_pm.h
+++ b/arch/arm/src/stm32/stm32_pm.h
@@ -1,4 +1,4 @@
-/************************************************************************************
+/****************************************************************************
  * arch/arm/src/stm32/stm32_pm.h
  *
  *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
@@ -31,7 +31,7 @@
  * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- ************************************************************************************/
+ ****************************************************************************/
 
 #ifndef __ARCH_ARM_SRC_STM32_STM32_PM_H
 #define __ARCH_ARM_SRC_STM32_STM32_PM_H
@@ -122,8 +122,8 @@ int stm32_pmstandby(void);
  *   sleeponexit - true:  SLEEPONEXIT bit is set when the WFI instruction is
  *                        executed, the MCU enters Sleep mode as soon as it
  *                        exits the lowest priority ISR.
- *               - false: SLEEPONEXIT bit is cleared, the MCU enters Sleep mode
- *                        as soon as WFI or WFE instruction is executed.
+ *               - false: SLEEPONEXIT bit is cleared, the MCU enters Sleep
+ *                        mode as soon as WFI or WFE instruction is executed.
  * Returned Value:
  *   None
  *