[PATCH] Serial: Eliminate magic numbers

Use the existing macros instead.

Signed-off-by: Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

4 files changed, 20 insertions, 20 deletions

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index 79f67fd863ec..d8b9d2b8c200 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1682,22 +1682,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
-                cval = 0x00;
+                cval = UART_LCR_WLEN5;
                 break;
         case CS6:
-                cval = 0x01;
+                cval = UART_LCR_WLEN6;
                 break;
         case CS7:
-                cval = 0x02;
+                cval = UART_LCR_WLEN7;
                 break;
         default:
         case CS8:
-                cval = 0x03;
+                cval = UART_LCR_WLEN8;
                 break;
         }
 
         if (termios->c_cflag & CSTOPB)
-                cval |= 0x04;
+                cval |= UART_LCR_STOP;
         if (termios->c_cflag & PARENB)
                 cval |= UART_LCR_PARITY;
         if (!(termios->c_cflag & PARODD))
diff --git a/drivers/serial/au1x00_uart.c b/drivers/serial/au1x00_uart.c
index b6d3d5034940..5400dc2c087e 100644
--- a/drivers/serial/au1x00_uart.c
+++ b/drivers/serial/au1x00_uart.c
@@ -773,22 +773,22 @@ serial8250_set_termios(struct uart_port *port, struct termios *termios,
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
-                cval = 0x00;
+                cval = UART_LCR_WLEN5;
                 break;
         case CS6:
-                cval = 0x01;
+                cval = UART_LCR_WLEN6;
                 break;
         case CS7:
-                cval = 0x02;
+                cval = UART_LCR_WLEN7;
                 break;
         default:
         case CS8:
-                cval = 0x03;
+                cval = UART_LCR_WLEN8;
                 break;
         }
 
         if (termios->c_cflag & CSTOPB)
-                cval |= 0x04;
+                cval |= UART_LCR_STOP;
         if (termios->c_cflag & PARENB)
                 cval |= UART_LCR_PARITY;
         if (!(termios->c_cflag & PARODD))
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 08d61f13edc6..0301feacbde4 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port,
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
-                cval = 0x00;
+                cval = UART_LCR_WLEN5;
                 break;
         case CS6:
-                cval = 0x01;
+                cval = UART_LCR_WLEN6;
                 break;
         case CS7:
-                cval = 0x02;
+                cval = UART_LCR_WLEN7;
                 break;
         default:
         case CS8:
-                cval = 0x03;
+                cval = UART_LCR_WLEN8;
                 break;
         }
 
         if (termios->c_cflag & CSTOPB)
-                cval |= 0x04;
+                cval |= UART_LCR_STOP;
         if (termios->c_cflag & PARENB)
                 cval |= UART_LCR_PARITY;
         if (!(termios->c_cflag & PARODD))
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c
index 9dc151d8fa61..08b08d6ae904 100644
--- a/drivers/serial/pxa.c
+++ b/drivers/serial/pxa.c
@@ -455,22 +455,22 @@ serial_pxa_set_termios(struct uart_port *port, struct termios *termios,
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
-                cval = 0x00;
+                cval = UART_LCR_WLEN5;
                 break;
         case CS6:
-                cval = 0x01;
+                cval = UART_LCR_WLEN6;
                 break;
         case CS7:
-                cval = 0x02;
+                cval = UART_LCR_WLEN7;
                 break;
         default:
         case CS8:
-                cval = 0x03;
+                cval = UART_LCR_WLEN8;
                 break;
         }
 
         if (termios->c_cflag & CSTOPB)
-                cval |= 0x04;
+                cval |= UART_LCR_STOP;
         if (termios->c_cflag & PARENB)
                 cval |= UART_LCR_PARITY;
         if (!(termios->c_cflag & PARODD))