serial: 8250: convert drivers to use up_to_u8250p()

up_to_u8250p() casts struct uart_port * to struct uart_8250_port *. Update code
to use it instead of open coded variant.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c
index a0294f3de4f898bbb151ab303a98668d75c3e894..3489fbcb7313a1e1cc59e6591beccf313f865eb0 100644 (file)
--- a/drivers/tty/serial/8250/8250_mtk.c
+++ b/drivers/tty/serial/8250/8250_mtk.c
@@ -41,12 +41,10 @@ static void
 mtk8250_set_termios(struct uart_port *port, struct ktermios *termios,
                        struct ktermios *old)
 {
+       struct uart_8250_port *up = up_to_u8250p(port);
        unsigned long flags;
        unsigned int baud, quot;
 
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
-
        serial8250_do_set_termios(port, termios, old);
 
        /*

diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c
index d710985a2e4ffb9e98314ee090607aa276cb48a7..6f760510e46da08a4beaa41d47e47e8ccdece352 100644 (file)
--- a/drivers/tty/serial/8250/8250_omap.c
+++ b/drivers/tty/serial/8250/8250_omap.c
@@ -318,8 +318,7 @@ static void omap_8250_set_termios(struct uart_port *port,
                                  struct ktermios *termios,
                                  struct ktermios *old)
 {
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
+       struct uart_8250_port *up = up_to_u8250p(port);
        struct omap8250_priv *priv = up->port.private_data;
        unsigned char cval = 0;
        unsigned int baud;
@@ -682,9 +681,8 @@ static void omap_8250_shutdown(struct uart_port *port)
 
 static void omap_8250_throttle(struct uart_port *port)
 {
+       struct uart_8250_port *up = up_to_u8250p(port);
        unsigned long flags;
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
 
        pm_runtime_get_sync(port->dev);
 
@@ -729,9 +727,8 @@ static int omap_8250_rs485_config(struct uart_port *port,
 
 static void omap_8250_unthrottle(struct uart_port *port)
 {
+       struct uart_8250_port *up = up_to_u8250p(port);
        unsigned long flags;
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
 
        pm_runtime_get_sync(port->dev);
 

diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 2ffda79a462a4f85461f9cb7270e90dbe384a311..e213da01a3d71b5fa6317a4990d30944ac2cd2c0 100644 (file)
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1597,8 +1597,7 @@ static void serial8250_unthrottle(struct uart_port *port)
 
 static void serial8250_disable_ms(struct uart_port *port)
 {
-       struct uart_8250_port *up =
-               container_of(port, struct uart_8250_port, port);
+       struct uart_8250_port *up = up_to_u8250p(port);
 
        /* no MSR capabilities */
        if (up->bugs & UART_BUG_NOMSR)
@@ -2801,8 +2800,7 @@ static int do_get_rxtrig(struct tty_port *port)
 {
        struct uart_state *state = container_of(port, struct uart_state, port);
        struct uart_port *uport = state->uart_port;
-       struct uart_8250_port *up =
-               container_of(uport, struct uart_8250_port, port);
+       struct uart_8250_port *up = up_to_u8250p(uport);
 
        if (!(up->capabilities & UART_CAP_FIFO) || uport->fifosize <= 1)
                return -EINVAL;
@@ -2838,8 +2836,7 @@ static int do_set_rxtrig(struct tty_port *port, unsigned char bytes)
 {
        struct uart_state *state = container_of(port, struct uart_state, port);
        struct uart_port *uport = state->uart_port;
-       struct uart_8250_port *up =
-               container_of(uport, struct uart_8250_port, port);
+       struct uart_8250_port *up = up_to_u8250p(uport);
        int rxtrig;
 
        if (!(up->capabilities & UART_CAP_FIFO) || uport->fifosize <= 1 ||