diff --git a/Kconfig b/Kconfig
index 188f9d007b0..4d7949d4e31 100644
--- a/Kconfig
+++ b/Kconfig
@@ -859,21 +859,21 @@ config DEBUG_IRQ
 if DEBUG_IRQ
 
 config DEBUG_IRQ_ERROR
-	bool "DMA Error Output"
+	bool "Interrupt Controller Error Output"
 	default n
 	depends on DEBUG_ERROR
 	---help---
 		Enable interrupt controller error output to SYSLOG.
 
 config DEBUG_IRQ_WARN
-	bool "DMA Warnings Output"
+	bool "Interrupt Controller Warnings Output"
 	default n
 	depends on DEBUG_WARN
 	---help---
 		Enable interrupt controller warning output to SYSLOG.
 
 config DEBUG_IRQ_INFO
-	bool "DMA Informational Output"
+	bool "Interrupt Controller Informational Output"
 	default n
 	depends on DEBUG_INFO
 	---help---
@@ -1277,7 +1277,7 @@ endif # DEBUG_RTC
 config DEBUG_MEMCARD
 	bool "Memory Card Driver Debug Features"
 	default n
-	depends on MMCSD_SDIO
+	depends on MMCSD
 	---help---
 		Enable MMC/SD memory card Driver debug features.
 
diff --git a/arch/arm/src/stm32/stm32_gpio.c b/arch/arm/src/stm32/stm32_gpio.c
index 03c6544e2d6..9eb5fb9597b 100644
--- a/arch/arm/src/stm32/stm32_gpio.c
+++ b/arch/arm/src/stm32/stm32_gpio.c
@@ -788,5 +788,6 @@ bool stm32_gpioread(uint32_t pinset)
       pin = (pinset & GPIO_PIN_MASK) >> GPIO_PIN_SHIFT;
       return ((getreg32(base + STM32_GPIO_IDR_OFFSET) & (1 << pin)) != 0);
     }
+
   return 0;
 }
diff --git a/arch/arm/src/stm32/stm32_pwm.c b/arch/arm/src/stm32/stm32_pwm.c
index 87bfb577421..85ed3554fc9 100644
--- a/arch/arm/src/stm32/stm32_pwm.c
+++ b/arch/arm/src/stm32/stm32_pwm.c
@@ -1139,6 +1139,8 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
               pwm_getreg(priv, STM32_GTIM_CCMR2_OFFSET));
     }
 
+  /* REVISIT: CNT and ARR may be 32-bits wide */
+
   pwminfo(" CCER: %04x CNT:  %04x PSC:   %04x ARR:   %04x\n",
           pwm_getreg(priv, STM32_GTIM_CCER_OFFSET),
           pwm_getreg(priv, STM32_GTIM_CNT_OFFSET),
@@ -1152,6 +1154,8 @@ static void pwm_dumpregs(struct stm32_pwmtimer_s *priv, FAR const char *msg)
           pwm_getreg(priv, STM32_ATIM_BDTR_OFFSET));
     }
 
+  /* REVISIT: CCR1-CCR4 may be 32-bits wide */
+
   if (priv->timid == 16 || priv->timid == 17)
     {
       pwminfo(" CCR1: %04x\n",
diff --git a/configs/teensy-3.x/src/k20_usbdev.c b/configs/teensy-3.x/src/k20_usbdev.c
index 2cf0d9d2e00..f5f20fbf246 100644
--- a/configs/teensy-3.x/src/k20_usbdev.c
+++ b/configs/teensy-3.x/src/k20_usbdev.c
@@ -59,7 +59,6 @@
 
 #define khci_getreg(addr)      getreg8(addr)
 #define khci_putreg(val,addr)  putreg8(val,addr)
-#define SIM_CLKDIV2_USBDIV(n)  (uint32_t)(((n) & 0x07) << 1)
 
 /************************************************************************************
  * Public Functions