Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[cascardo/linux.git] / drivers / tty / serial / ip22zilog.c

diff --git a/drivers/tty/serial/ip22zilog.c b/drivers/tty/serial/ip22zilog.c
index 99b7b86..991e6dc 100644 (file)
--- a/drivers/tty/serial/ip22zilog.c
+++ b/drivers/tty/serial/ip22zilog.c
@@ -544,7 +544,8 @@ static unsigned int ip22zilog_get_mctrl(struct uart_port *port)
 /* The port lock is held and interrupts are disabled.  */
 static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
        unsigned char set_bits, clear_bits;
 
@@ -568,7 +569,8 @@ static void ip22zilog_set_mctrl(struct uart_port *port, unsigned int mctrl)
 /* The port lock is held and interrupts are disabled.  */
 static void ip22zilog_stop_tx(struct uart_port *port)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
 
        up->flags |= IP22ZILOG_FLAG_TX_STOPPED;
 }
@@ -576,7 +578,8 @@ static void ip22zilog_stop_tx(struct uart_port *port)
 /* The port lock is held and interrupts are disabled.  */
 static void ip22zilog_start_tx(struct uart_port *port)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
        unsigned char status;
 
@@ -636,7 +639,8 @@ static void ip22zilog_stop_rx(struct uart_port *port)
 /* The port lock is held.  */
 static void ip22zilog_enable_ms(struct uart_port *port)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
        unsigned char new_reg;
 
@@ -652,7 +656,8 @@ static void ip22zilog_enable_ms(struct uart_port *port)
 /* The port lock is not held.  */
 static void ip22zilog_break_ctl(struct uart_port *port, int break_state)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
        struct zilog_channel *channel = ZILOG_CHANNEL_FROM_PORT(port);
        unsigned char set_bits, clear_bits, new_reg;
        unsigned long flags;
@@ -873,7 +878,8 @@ static void
 ip22zilog_set_termios(struct uart_port *port, struct ktermios *termios,
                      struct ktermios *old)
 {
-       struct uart_ip22zilog_port *up = (struct uart_ip22zilog_port *) port;
+       struct uart_ip22zilog_port *up =
+               container_of(port, struct uart_ip22zilog_port, port);
        unsigned long flags;
        int baud, brg;