diff --git a/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c b/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c
index 67e743d17a..62f049e1d6 100644
--- a/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c
+++ b/arch/arm/src/sam34/sam4cm_oneshot_lowerhalf.c
@@ -133,20 +133,20 @@ static void sam_oneshot_handler(void *arg)
    */
 
   if (priv->callback)
-  {
-    /* Sample and nullify BEFORE executing callback (in case the callback
-     * restarts the oneshot).
-     */
+    {
+      /* Sample and nullify BEFORE executing callback (in case the callback
+       * restarts the oneshot).
+       */
 
-    callback       = priv->callback;
-    cbarg          = priv->arg;
-    priv->callback = NULL;
-    priv->arg      = NULL;
+      callback       = priv->callback;
+      cbarg          = priv->arg;
+      priv->callback = NULL;
+      priv->arg      = NULL;
 
-    /* Then perform the callback */
+      /* Then perform the callback */
 
-    callback(&priv->lh, cbarg);
-  }
+      callback(&priv->lh, cbarg);
+    }
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/sama5/sam_oneshot_lowerhalf.c b/arch/arm/src/sama5/sam_oneshot_lowerhalf.c
index e6aa2e40a7..f2c1eeed39 100644
--- a/arch/arm/src/sama5/sam_oneshot_lowerhalf.c
+++ b/arch/arm/src/sama5/sam_oneshot_lowerhalf.c
@@ -135,20 +135,20 @@ static void sam_oneshot_handler(void *arg)
    */
 
   if (priv->callback)
-  {
-    /* Sample and nullify BEFORE executing callback (in case the callback
-     * restarts the oneshot).
-     */
+    {
+      /* Sample and nullify BEFORE executing callback (in case the callback
+       * restarts the oneshot).
+       */
 
-    callback       = priv->callback;
-    cbarg          = priv->arg;
-    priv->callback = NULL;
-    priv->arg      = NULL;
+      callback       = priv->callback;
+      cbarg          = priv->arg;
+      priv->callback = NULL;
+      priv->arg      = NULL;
 
-    /* Then perform the callback */
+      /* Then perform the callback */
 
-    callback(&priv->lh, cbarg);
-  }
+      callback(&priv->lh, cbarg);
+    }
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/samv7/sam_oneshot_lowerhalf.c b/arch/arm/src/samv7/sam_oneshot_lowerhalf.c
index b4ffbdd361..d5e80f5489 100644
--- a/arch/arm/src/samv7/sam_oneshot_lowerhalf.c
+++ b/arch/arm/src/samv7/sam_oneshot_lowerhalf.c
@@ -133,20 +133,20 @@ static void sam_oneshot_handler(void *arg)
    */
 
   if (priv->callback)
-  {
-    /* Sample and nullify BEFORE executing callback (in case the callback
-     * restarts the oneshot).
-     */
+    {
+      /* Sample and nullify BEFORE executing callback (in case the callback
+       * restarts the oneshot).
+       */
 
-    callback       = priv->callback;
-    cbarg          = priv->arg;
-    priv->callback = NULL;
-    priv->arg      = NULL;
+      callback       = priv->callback;
+      cbarg          = priv->arg;
+      priv->callback = NULL;
+      priv->arg      = NULL;
 
-    /* Then perform the callback */
+      /* Then perform the callback */
 
-    callback(&priv->lh, cbarg);
-  }
+      callback(&priv->lh, cbarg);
+    }
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c b/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c
index 24b36de555..ae76ffaa80 100644
--- a/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c
+++ b/arch/arm/src/stm32/stm32_oneshot_lowerhalf.c
@@ -133,20 +133,20 @@ static void stm32_oneshot_handler(void *arg)
    */
 
   if (priv->callback)
-  {
-    /* Sample and nullify BEFORE executing callback (in case the callback
-     * restarts the oneshot).
-     */
+    {
+      /* Sample and nullify BEFORE executing callback (in case the callback
+       * restarts the oneshot).
+       */
 
-    callback       = priv->callback;
-    cbarg          = priv->arg;
-    priv->callback = NULL;
-    priv->arg      = NULL;
+      callback       = priv->callback;
+      cbarg          = priv->arg;
+      priv->callback = NULL;
+      priv->arg      = NULL;
 
-    /* Then perform the callback */
+      /* Then perform the callback */
 
-    callback(&priv->lh, cbarg);
-  }
+      callback(&priv->lh, cbarg);
+    }
 }
 
 /****************************************************************************
diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c b/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c
index faf6afd5f5..4d3213ce1b 100644
--- a/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c
+++ b/arch/arm/src/stm32l4/stm32l4_oneshot_lowerhalf.c
@@ -133,20 +133,20 @@ static void stm32l4_oneshot_handler(void *arg)
    */
 
   if (priv->callback)
-  {
-    /* Sample and nullify BEFORE executing callback (in case the callback
-     * restarts the oneshot).
-     */
+    {
+      /* Sample and nullify BEFORE executing callback (in case the callback
+       * restarts the oneshot).
+       */
 
-    callback       = priv->callback;
-    cbarg          = priv->arg;
-    priv->callback = NULL;
-    priv->arg      = NULL;
+      callback       = priv->callback;
+      cbarg          = priv->arg;
+      priv->callback = NULL;
+      priv->arg      = NULL;
 
-    /* Then perform the callback */
+      /* Then perform the callback */
 
-    callback(&priv->lh, cbarg);
-  }
+      callback(&priv->lh, cbarg);
+    }
 }
 
 /****************************************************************************