serial: 8250_uniphier: avoid locking for FCR register write

The hardware book says, the FCR is combined with a register called
CHAR (it will trigger interrupt when a specific character is
received).  At first, I used lock/read/modify/write/unlock dance for
the FCR to not affect the upper bits, but the CHAR is actually never
used.  It should not hurt to always clear the CHAR and to handle the
FCR as a normal case.  It can save the costly locking.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Suggested-by: Denys Vlasenko <dvlasenk@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_uniphier.c b/drivers/tty/serial/8250/8250_uniphier.c
index 92e7bb7b3f83a09fd25d1c53c6a525ab02bfd504..746680ebf90c572b6e01ec3080555454477ac8d8 100644 (file)
--- a/drivers/tty/serial/8250/8250_uniphier.c
+++ b/drivers/tty/serial/8250/8250_uniphier.c
@@ -101,7 +101,7 @@ static unsigned int uniphier_serial_in(struct uart_port *p, int offset)
 static void uniphier_serial_out(struct uart_port *p, int offset, int value)
 {
        unsigned int valshift = 0;
-       bool normal = false;
+       bool normal = true;
 
        switch (offset) {
        case UART_FCR:
@@ -114,9 +114,9 @@ static void uniphier_serial_out(struct uart_port *p, int offset, int value)
                /* fall through */
        case UART_MCR:
                offset = UNIPHIER_UART_LCR_MCR;
+               normal = false;
                break;
        default:
-               normal = true;
                offset <<= UNIPHIER_UART_REGSHIFT;
                break;
        }