From 52aeabb4b2649eeae96dc8cce87e269837f9b2c8 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 2 Jan 2015 13:59:47 -0600
Subject: [PATCH] Cosmetic changes

---
 arch/arm/src/tiva/tiva_serial.c |  2 +-
 drivers/serial/serial.c         | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/src/tiva/tiva_serial.c b/arch/arm/src/tiva/tiva_serial.c
index 161bd0da30..a84e71763c 100644
--- a/arch/arm/src/tiva/tiva_serial.c
+++ b/arch/arm/src/tiva/tiva_serial.c
@@ -1289,7 +1289,7 @@ void up_earlyserialinit(void)
   up_disableuartint(TTYS7_DEV.priv, NULL);
 #endif
 
-  /* Configuration whichever one is the console */
+  /* Configure whichever one is the console */
 
 #ifdef HAVE_SERIAL_CONSOLE
   CONSOLE_DEV.isconsole = true;
diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index 0014289004..b2719e62a2 100644
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -421,18 +421,18 @@ static ssize_t uart_write(FAR struct file *filep, FAR const char *buffer,
 #ifdef CONFIG_SERIAL_TERMIOS
       /* Do output post-processing */
 
-      if (dev->tc_oflag & OPOST)
+      if ((dev->tc_oflag & OPOST) != 0)
         {
           /* Mapping CR to NL? */
 
-          if ((ch == '\r') && (dev->tc_oflag & OCRNL))
+          if ((ch == '\r') && (dev->tc_oflag & OCRNL) != 0)
             {
               ch = '\n';
             }
 
           /* Are we interested in newline processing? */
 
-          if ((ch == '\n') && (dev->tc_oflag & (ONLCR | ONLRET)))
+          if ((ch == '\n') && (dev->tc_oflag & (ONLCR | ONLRET)) != 0)
             {
               ret = uart_putxmitchar(dev, '\r', oktoblock);
               if (ret < 0)
@@ -898,7 +898,7 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
         {
           case TCGETS:
             {
-              struct termios *termiosp = (struct termios*)arg;
+              FAR struct termios *termiosp = (struct termios*)arg;
 
               if (!termiosp)
                 {
@@ -916,7 +916,7 @@ static int uart_ioctl(FAR struct file *filep, int cmd, unsigned long arg)
 
           case TCSETS:
             {
-              struct termios *termiosp = (struct termios*)arg;
+              FAR struct termios *termiosp = (struct termios*)arg;
 
               if (!termiosp)
                 {
@@ -1269,7 +1269,7 @@ static int uart_open(FAR struct file *filep)
 
 #ifdef CONFIG_SERIAL_TERMIOS
       dev->tc_iflag = 0;
-      if (dev->isconsole == true)
+      if (dev->isconsole)
         {
           /* Enable \n -> \r\n translation for the console */