Commit f9c1b28e authored by Fabian Frederick's avatar Fabian Frederick Committed by Greg Kroah-Hartman

tty: ar933x_uart: use container_of to resolve ar933x_uart_port from uart_port

Use container_of instead of casting first structure member.
Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6f414130
...@@ -119,7 +119,8 @@ static inline void ar933x_uart_putc(struct ar933x_uart_port *up, int ch) ...@@ -119,7 +119,8 @@ static inline void ar933x_uart_putc(struct ar933x_uart_port *up, int ch)
static unsigned int ar933x_uart_tx_empty(struct uart_port *port) static unsigned int ar933x_uart_tx_empty(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
unsigned long flags; unsigned long flags;
unsigned int rdata; unsigned int rdata;
...@@ -141,21 +142,24 @@ static void ar933x_uart_set_mctrl(struct uart_port *port, unsigned int mctrl) ...@@ -141,21 +142,24 @@ static void ar933x_uart_set_mctrl(struct uart_port *port, unsigned int mctrl)
static void ar933x_uart_start_tx(struct uart_port *port) static void ar933x_uart_start_tx(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
ar933x_uart_start_tx_interrupt(up); ar933x_uart_start_tx_interrupt(up);
} }
static void ar933x_uart_stop_tx(struct uart_port *port) static void ar933x_uart_stop_tx(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
ar933x_uart_stop_tx_interrupt(up); ar933x_uart_stop_tx_interrupt(up);
} }
static void ar933x_uart_stop_rx(struct uart_port *port) static void ar933x_uart_stop_rx(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
up->ier &= ~AR933X_UART_INT_RX_VALID; up->ier &= ~AR933X_UART_INT_RX_VALID;
ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier); ar933x_uart_write(up, AR933X_UART_INT_EN_REG, up->ier);
...@@ -163,7 +167,8 @@ static void ar933x_uart_stop_rx(struct uart_port *port) ...@@ -163,7 +167,8 @@ static void ar933x_uart_stop_rx(struct uart_port *port)
static void ar933x_uart_break_ctl(struct uart_port *port, int break_state) static void ar933x_uart_break_ctl(struct uart_port *port, int break_state)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&up->port.lock, flags); spin_lock_irqsave(&up->port.lock, flags);
...@@ -231,7 +236,8 @@ static void ar933x_uart_set_termios(struct uart_port *port, ...@@ -231,7 +236,8 @@ static void ar933x_uart_set_termios(struct uart_port *port,
struct ktermios *new, struct ktermios *new,
struct ktermios *old) struct ktermios *old)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
unsigned int cs; unsigned int cs;
unsigned long flags; unsigned long flags;
unsigned int baud, scale, step; unsigned int baud, scale, step;
...@@ -404,7 +410,8 @@ static irqreturn_t ar933x_uart_interrupt(int irq, void *dev_id) ...@@ -404,7 +410,8 @@ static irqreturn_t ar933x_uart_interrupt(int irq, void *dev_id)
static int ar933x_uart_startup(struct uart_port *port) static int ar933x_uart_startup(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
unsigned long flags; unsigned long flags;
int ret; int ret;
...@@ -430,7 +437,8 @@ static int ar933x_uart_startup(struct uart_port *port) ...@@ -430,7 +437,8 @@ static int ar933x_uart_startup(struct uart_port *port)
static void ar933x_uart_shutdown(struct uart_port *port) static void ar933x_uart_shutdown(struct uart_port *port)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
/* Disable all interrupts */ /* Disable all interrupts */
up->ier = 0; up->ier = 0;
...@@ -468,7 +476,8 @@ static void ar933x_uart_config_port(struct uart_port *port, int flags) ...@@ -468,7 +476,8 @@ static void ar933x_uart_config_port(struct uart_port *port, int flags)
static int ar933x_uart_verify_port(struct uart_port *port, static int ar933x_uart_verify_port(struct uart_port *port,
struct serial_struct *ser) struct serial_struct *ser)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
if (ser->type != PORT_UNKNOWN && if (ser->type != PORT_UNKNOWN &&
ser->type != PORT_AR933X) ser->type != PORT_AR933X)
...@@ -521,7 +530,8 @@ static void ar933x_uart_wait_xmitr(struct ar933x_uart_port *up) ...@@ -521,7 +530,8 @@ static void ar933x_uart_wait_xmitr(struct ar933x_uart_port *up)
static void ar933x_uart_console_putchar(struct uart_port *port, int ch) static void ar933x_uart_console_putchar(struct uart_port *port, int ch)
{ {
struct ar933x_uart_port *up = (struct ar933x_uart_port *) port; struct ar933x_uart_port *up =
container_of(port, struct ar933x_uart_port, port);
ar933x_uart_wait_xmitr(up); ar933x_uart_wait_xmitr(up);
ar933x_uart_putc(up, ch); ar933x_uart_putc(up, ch);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment