diff --git a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c
index ce9913bc1d7..0945280f19b 100644
--- a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c
+++ b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c
@@ -542,7 +542,7 @@ static int pic32mz_ioctl(FAR struct timer_lowerhalf_s *lower, int cmd,
 }
 
 /****************************************************************************
- * Name: pic32mz_ioctl
+ * Name: pic32mz_maxtimeout
  *
  * Description:
  *   Get the maximum supported timeout value
diff --git a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
index c8e9ec3e48e..ad8ecf4d6d5 100644
--- a/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/nucleo-l432kc/src/stm32_appinit.c
@@ -128,8 +128,7 @@ int board_app_initialize(uintptr_t arg)
   ret = nx_mount(NULL, CONFIG_NSH_PROC_MOUNTPOINT, "procfs", 0, NULL);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to mount the PROC filesystem: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to mount the PROC filesystem: %d\n",
              ret);
       return ret;
     }
@@ -297,8 +296,7 @@ int board_app_initialize(uintptr_t arg)
   ret = board_timer_driver_initialize("/dev/timer0", 2);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the timer driver: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the timer driver: %d\n",
              ret);
       return ret;
     }
@@ -314,8 +312,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 1);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -326,8 +323,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 2);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -338,8 +334,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 3);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -350,8 +345,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 4);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -362,8 +356,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 5);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -374,8 +367,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 8);
   if (ret != OK)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
diff --git a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
index 968fc280d36..12e8741abde 100644
--- a/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
+++ b/boards/arm/stm32l4/nucleo-l476rg/src/stm32_appinit.c
@@ -294,8 +294,7 @@ int board_app_initialize(uintptr_t arg)
   ret = board_ajoy_initialize();
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the joystick driver: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the joystick driver: %d\n",
              ret);
       return ret;
     }
@@ -307,8 +306,7 @@ int board_app_initialize(uintptr_t arg)
   ret = board_timer_driver_initialize("/dev/timer0", 2);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the timer driver: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the timer driver: %d\n",
              ret);
       return ret;
     }
@@ -324,8 +322,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 1);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -336,8 +333,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 2);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -348,8 +344,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 3);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -360,8 +355,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 4);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -372,8 +366,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 5);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -384,8 +377,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_qencoder_initialize(buf, 8);
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: Failed to register the qencoder: %d\n",
+      syslog(LOG_ERR, "ERROR: Failed to register the qencoder: %d\n",
              ret);
       return ret;
     }
@@ -431,8 +423,7 @@ int board_app_initialize(uintptr_t arg)
   ret = stm32l4_cc1101_initialize();
   if (ret < 0)
     {
-      syslog(LOG_ERR,
-             "ERROR: stm32l4_cc1101_initialize failed: %d\n",
+      syslog(LOG_ERR, "ERROR: stm32l4_cc1101_initialize failed: %d\n",
              ret);
       return ret;
     }
diff --git a/sched/task/task_cancelpt.c b/sched/task/task_cancelpt.c
index ddc94d44c1a..58f7f1bc3f2 100644
--- a/sched/task/task_cancelpt.c
+++ b/sched/task/task_cancelpt.c
@@ -398,7 +398,7 @@ bool nxnotify_cancellation(FAR struct tcb_s *tcb)
            */
 
           else if (tcb->task_state == TSTATE_WAIT_MQNOTEMPTY ||
-                  tcb->task_state == TSTATE_WAIT_MQNOTFULL)
+                   tcb->task_state == TSTATE_WAIT_MQNOTFULL)
             {
               nxmq_wait_irq(tcb, ECANCELED);
             }