diff --git a/arch/arm/src/stm32/stm32_ccm.c b/arch/arm/src/stm32/stm32_ccm.c
index cdf7fb8805b..95d5b3a7c30 100644
--- a/arch/arm/src/stm32/stm32_ccm.c
+++ b/arch/arm/src/stm32/stm32_ccm.c
@@ -44,14 +44,6 @@
 
 #ifdef HAVE_CCM_HEAP
 
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
 /****************************************************************************
  * Public Data
  ****************************************************************************/
diff --git a/arch/arm/src/stm32/stm32_ccm.h b/arch/arm/src/stm32/stm32_ccm.h
index 2f73021cd4c..e5ad55888ea 100644
--- a/arch/arm/src/stm32/stm32_ccm.h
+++ b/arch/arm/src/stm32/stm32_ccm.h
@@ -48,7 +48,9 @@
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
+
 /* Configuration ************************************************************/
+
 /* Assume that we can support the CCM heap */
 
 #define HAVE_CCM_HEAP 1
diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c
index 76151860512..4c71a902ba3 100644
--- a/drivers/input/ft5x06.c
+++ b/drivers/input/ft5x06.c
@@ -1044,7 +1044,7 @@ static int ft5x06_poll(FAR struct file *filep, FAR struct pollfd *fds,
   ret = nxsem_wait(&priv->devsem);
   if (ret < 0)
     {
-      /* This should only happen if the wait was cancelled by an signal */
+      /* This should only happen if the wait was canceled by an signal */
 
       ierr("ERROR: nxsem_wait failed: %d\n", ret);
       DEBUGASSERT(ret == -EINTR || ret == -ECANCELED);
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 4af97408c5b..15789ebf44d 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -1456,7 +1456,7 @@ static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
   /* Some sanity checking */
 
 #ifdef CONFIG_DEBUG_FEATURES
-  if (!dev || !fds)
+  if (dev == NULL || fds == NULL)
     {
       return -ENODEV;
     }
@@ -1555,11 +1555,11 @@ static int uart_poll(FAR struct file *filep, FAR struct pollfd *fds, bool setup)
         }
 
     }
-  else if (fds->priv)
+  else if (fds->priv != NULL)
     {
       /* This is a request to tear down the poll. */
 
-      struct pollfd **slot = (struct pollfd **)fds->priv;
+      FAR struct pollfd **slot = (FAR struct pollfd **)fds->priv;
 
 #ifdef CONFIG_DEBUG_FEATURES
       if (!slot)
diff --git a/graphics/nxterm/nxterm_kbdin.c b/graphics/nxterm/nxterm_kbdin.c
index c0a77b81960..bff320e652d 100644
--- a/graphics/nxterm/nxterm_kbdin.c
+++ b/graphics/nxterm/nxterm_kbdin.c
@@ -457,7 +457,7 @@ void nxterm_kbdin(NXTERM handle, FAR const uint8_t *buffer, uint8_t buflen)
           nxsem_post(&priv->waitsem);
         }
 
-      /* Notify all poll/select waiters that they can write to the FIFO */
+      /* Notify all poll/select waiters that they can read from the FIFO */
 
       nxterm_pollnotify(priv, POLLIN);
       sched_unlock();