diff --git a/arch/arm/src/samv7/sam_rswdt.c b/arch/arm/src/samv7/sam_rswdt.c
index fdc3d78ad8a..8025f459195 100644
--- a/arch/arm/src/samv7/sam_rswdt.c
+++ b/arch/arm/src/samv7/sam_rswdt.c
@@ -118,13 +118,13 @@ static int      sam_start(struct watchdog_lowerhalf_s *lower);
 static int      sam_stop(struct watchdog_lowerhalf_s *lower);
 static int      sam_keepalive(struct watchdog_lowerhalf_s *lower);
 static int      sam_getstatus(struct watchdog_lowerhalf_s *lower,
-                  struct watchdog_status_s *status);
+                              struct watchdog_status_s *status);
 static int      sam_settimeout(struct watchdog_lowerhalf_s *lower,
-                  uint32_t timeout);
+                               uint32_t timeout);
 static xcpt_t   sam_capture(struct watchdog_lowerhalf_s *lower,
-                  xcpt_t handler);
+                            xcpt_t handler);
 static int      sam_ioctl(struct watchdog_lowerhalf_s *lower, int cmd,
-                  unsigned long arg);
+                          unsigned long arg);
 
 /****************************************************************************
  * Private Data
@@ -336,7 +336,7 @@ static int sam_stop(struct watchdog_lowerhalf_s *lower)
  * Description:
  *   Reset the watchdog timer to the current timeout value, prevent any
  *   imminent watchdog timeouts.  This is sometimes referred as "pinging"
- *   the atchdog timer or "petting the dog".
+ *   the watchdog timer or "petting the dog".
  *
  * Input Parameters:
  *   lower - A pointer the publicly visible representation of the
diff --git a/arch/risc-v/src/mpfs/mpfs_usb.c b/arch/risc-v/src/mpfs/mpfs_usb.c
index fc8f6973350..6df832a6051 100644
--- a/arch/risc-v/src/mpfs/mpfs_usb.c
+++ b/arch/risc-v/src/mpfs/mpfs_usb.c
@@ -326,7 +326,7 @@ static void mpfs_modifyreg16(uintptr_t addr, uint16_t clearbits,
  ****************************************************************************/
 
 static void mpfs_modifyreg8(uintptr_t addr, uint8_t clearbits,
-                             uint8_t setbits)
+                            uint8_t setbits)
 {
   irqstate_t flags;
   uint8_t    regval;
diff --git a/arch/xtensa/src/esp32/esp32_serial.c b/arch/xtensa/src/esp32/esp32_serial.c
index 0beb5c65487..dc2ee151cd5 100644
--- a/arch/xtensa/src/esp32/esp32_serial.c
+++ b/arch/xtensa/src/esp32/esp32_serial.c
@@ -1393,7 +1393,7 @@ static int esp32_interrupt(int cpuint, void *context, void *arg)
       if ((enabled & UART_TX_BRK_IDLE_DONE_INT_ENA) != 0 &&
           (status & UART_TX_DONE_INT_ST) != 0)
         {
-          /* If al bytes were transmited, then we can disable the RS485
+          /* If all bytes were transmitted, then we can disable the RS485
            * transmit (TX/nTX) pin.
            */
 
@@ -1412,7 +1412,7 @@ static int esp32_interrupt(int cpuint, void *context, void *arg)
        */
 
       if ((enabled & (UART_RXFIFO_FULL_INT_ENA |
-                     UART_RXFIFO_TOUT_INT_ENA)) != 0)
+                      UART_RXFIFO_TOUT_INT_ENA)) != 0)
         {
           /* Is there any data waiting in the Rx FIFO? */
 
diff --git a/drivers/can/can.c b/drivers/can/can.c
index 2b24e812256..d387a37bff1 100644
--- a/drivers/can/can.c
+++ b/drivers/can/can.c
@@ -464,7 +464,7 @@ static int can_close(FAR struct file *filep)
 
   while (dev->cd_xmit.tx_head != dev->cd_xmit.tx_tail)
     {
-       nxsig_usleep(HALF_SECOND_USEC);
+      nxsig_usleep(HALF_SECOND_USEC);
     }
 
   /* And wait for the TX hardware FIFO to drain */
diff --git a/drivers/timers/watchdog.c b/drivers/timers/watchdog.c
index 2bae74ec2ec..c055776b1c8 100644
--- a/drivers/timers/watchdog.c
+++ b/drivers/timers/watchdog.c
@@ -112,11 +112,11 @@ struct watchdog_upperhalf_s
 static int     wdog_open(FAR struct file *filep);
 static int     wdog_close(FAR struct file *filep);
 static ssize_t wdog_read(FAR struct file *filep, FAR char *buffer,
-                 size_t buflen);
+                         size_t buflen);
 static ssize_t wdog_write(FAR struct file *filep, FAR const char *buffer,
-                 size_t buflen);
+                          size_t buflen);
 static int     wdog_ioctl(FAR struct file *filep, int cmd,
-                 unsigned long arg);
+                          unsigned long arg);
 
 /****************************************************************************
  * Private Data
diff --git a/drivers/wireless/bluetooth/bt_bridge.c b/drivers/wireless/bluetooth/bt_bridge.c
index 526669680d3..461ae618f86 100644
--- a/drivers/wireless/bluetooth/bt_bridge.c
+++ b/drivers/wireless/bluetooth/bt_bridge.c
@@ -399,7 +399,7 @@ static int bt_bridge_open(FAR struct bt_driver_s *drv)
 
   if (atomic_fetch_add(&bridge->refs, 1) == 0)
     {
-      int ret  = driver->open(driver);
+      int ret = driver->open(driver);
       if (ret < 0)
         {
           atomic_fetch_sub(&bridge->refs, 1);
@@ -416,7 +416,7 @@ static int bt_bridge_send(FAR struct bt_driver_s *drv,
                           FAR void *data, size_t len)
 {
   FAR struct bt_bridge_device_s *device =
-          (FAR struct bt_bridge_device_s *)drv;
+    (FAR struct bt_bridge_device_s *)drv;
   FAR struct bt_bridge_s *bridge = device->bridge;
   FAR struct bt_driver_s *driver = bridge->driver;
   irqstate_t flags;
@@ -490,7 +490,7 @@ static int bt_bridge_ioctl(FAR struct bt_driver_s *drv, int cmd,
                            unsigned long arg)
 {
   FAR struct bt_bridge_device_s *device =
-          (FAR struct bt_bridge_device_s *)drv;
+    (FAR struct bt_bridge_device_s *)drv;
   FAR struct bt_bridge_s *bridge = device->bridge;
   int ret;
 
diff --git a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
index a2bb2b29912..bf81ac0033d 100644
--- a/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
+++ b/drivers/wireless/ieee80211/bcm43xxx/bcmf_sdpcm.c
@@ -41,7 +41,7 @@
 #include "bcmf_interface.h"
 #include "bcmf_utils.h"
 
- #include "bcmf_netdev.h"
+#include "bcmf_netdev.h"
 
 #include "bcmf_sdio_regs.h"