diff --git a/ChangeLog b/ChangeLog
index d7c18ea014..d4085fd5db 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -12023,7 +12023,7 @@
 	  - Increase the allowed SPI-Frequency from 20 to 40 MHz.
 	  - Correct and rename the "VARSELECT" option
 	    This option was included in the code as "CONFIG_SPI_VARSELECT" but
-	    nowhere  defined in a Kconfig file. The patch renames it to
+	    nowhere  defined in a Kconfig file. The change renames it to
 	    "CONFIG_SAMV7_SPI_VARSELECT" and corrects the implementation
 	    according the datasheet of Atmel. In short, this option switches
 	    the processor from "fixed peripheral selection" (single device) to
diff --git a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
index 5a4886ec6c..928be38e95 100644
--- a/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
+++ b/arch/arm/src/tiva/chip/tm4c129_syscontrol.h
@@ -254,7 +254,7 @@
 #define TIVA_SYSCON_UNIQUEID2_OFFSET   0x0f28 /* Unique ID 2 */
 #define TIVA_SYSCON_UNIQUEID3_OFFSET   0x0f2c /* Unique ID 3 */
 
-/*( CCM System Control Registers (CCM Control Offset) */
+/* CCM System Control Registers (CCM Control Offset) */
 
 #define TIVA_SYSCON_CCMCGREQ_OFFSET    0x0204 /* Cryptographic Modules Clock Gating Request */
 
diff --git a/drivers/leds/pca9635pw.c b/drivers/leds/pca9635pw.c
index 62cf0c1cbf..b0820e17f3 100644
--- a/drivers/leds/pca9635pw.c
+++ b/drivers/leds/pca9635pw.c
@@ -53,14 +53,12 @@
  ****************************************************************************/
 
 #ifdef CONFIG_DEBUG_LEDS
-#  define derr llerr
-#  ifdef CONFIG_DEBUG_INFO
-#    define dinfo llinfo
-#  else
-#    define dinfo(x...)
-#  endif
+#  define derr  llerr
+#  define dwarn llwarn
+#  define dinfo llinfo
 #else
 #  define derr(x...)
+#  define dwarn(x...)
 #  define dinfo(x...)
 #endif
 
@@ -121,8 +119,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
 {
   struct i2c_config_s config;
 
-  dinfo("pca9635pw_i2c_write_byte\n");
-
   /* assemble the 2 byte message comprised of reg_addr and reg_val */
 
   uint8_t const BUFFER_SIZE = 2;
@@ -142,7 +138,6 @@ static int pca9635pw_i2c_write_byte(FAR struct pca9635pw_dev_s *priv,
   dinfo("i2c addr: 0x%02X reg addr: 0x%02X value: 0x%02X\n", priv->i2c_addr,
         buffer[0], buffer[1]);
 
-
   ret = i2c_write(priv->i2c, &config, buffer, BUFFER_SIZE);
   if (ret != OK)
     {
@@ -189,11 +184,8 @@ static int pca9635pw_set_led_mode(FAR struct pca9635pw_dev_s *priv,
 
 static int pca9635pw_open(FAR struct file *filep)
 {
-  dinfo("pca9635pw_open\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Wake up the PCA9635PW (sleep bit PCA9635PW_MODE_1_SLEEP is set to zero
@@ -261,11 +253,8 @@ static int pca9635pw_open(FAR struct file *filep)
 
 static int pca9635pw_close(FAR struct file *filep)
 {
-  dinfo("pca9635pw_close\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = -1;
 
   /* Turn all led drivers off */
@@ -301,11 +290,8 @@ static int pca9635pw_close(FAR struct file *filep)
 
 static int pca9635pw_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 {
-  dinfo("pca9635pw_ioctl\n");
-
   FAR struct inode *inode = filep->f_inode;
   FAR struct pca9635pw_dev_s *priv = inode->i_private;
-
   int ret = OK;
 
   dinfo("cmd: %d arg: %ld\n", cmd, arg);