: use container_of in mcf.c
Use container_of() instead of assuming local uart struct is first member of uart_port struct.
Signed-off-by Greg Ungerer <[email protected]>
---
drivers/serial/mcf.c +10 -10
@@ -69,7 +69,7 @@ static unsigned int mcf_tx_empty(structstatic unsigned int mcf_get_mctrl (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;unsigned int sigs;
@@ -87,7 +87,7 @@ static unsigned int mcf_get_mctrl(structstatic void mcf_set_mctrl (struct uart_port *port,unsigned int sigs) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -104,7 +104,7 @@ static void mcf_set_mctrl(struct uart_postatic void mcf_start_tx (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -117,7 +117,7 @@ static void mcf_start_tx(struct uart_porstatic void mcf_stop_tx (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -130,7 +130,7 @@ static void mcf_stop_tx(struct uart_portstatic void mcf_stop_rx (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -163,7 +163,7 @@ static void mcf_enable_ms(struct uart_postatic int mcf_startup (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -189,7 +189,7 @@ static int mcf_startup(struct uart_portstatic void mcf_shutdown (struct uart_port *port) { -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned long flags;spin_lock_irqsave (&port->lock, flags);
@@ -273,7 +273,7 @@ static void mcf_set_termios(struct uart_static void mcf_rx_chars (struct mcf_uart *pp) { -struct uart_port *port = (struct uart_port *) pp; +struct uart_port *port = &pp->port;unsigned char status, ch, flag;while ((status =readb (port->membase +MCFUART_USR )) &MCFUART_USR_RXREADY ) {
@@ -319,7 +319,7 @@ static void mcf_rx_chars(struct mcf_uartstatic void mcf_tx_chars (struct mcf_uart *pp) { -struct uart_port *port = (struct uart_port *) pp; +struct uart_port *port = &pp->port;struct circ_buf *xmit = &port->info->xmit;if (port->x_char) {
@@ -352,7 +352,7 @@ static void mcf_tx_chars(struct mcf_uartstatic irqreturn_t mcf_interrupt (int irq,void *data) {struct uart_port *port = data; -struct mcf_uart *pp = (struct mcf_uart *) port; + struct mcf_uart *pp = container_of(port, struct mcf_uart, port);unsigned int isr; isr =readb (port->membase +MCFUART_UISR ) & pp->imr;