Skip to content

Commit

Permalink
serial: imx: document functions that are called with port.lock taken
Browse files Browse the repository at this point in the history
Consistently indicate being called with irqs off and the port lock taken
for all functions that this applies to.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Uwe Kleine-König authored and Greg Kroah-Hartman committed Feb 28, 2018
1 parent 302e8dc commit 6aed2a8
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions drivers/tty/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,9 +342,7 @@ static void imx_port_rts_auto(struct imx_port *sport, unsigned long *ucr2)
*ucr2 |= UCR2_CTSC;
}

/*
* interrupts disabled on entry
*/
/* called with port.lock taken and irqs off */
static void imx_stop_tx(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand Down Expand Up @@ -377,9 +375,7 @@ static void imx_stop_tx(struct uart_port *port)
}
}

/*
* interrupts disabled on entry
*/
/* called with port.lock taken and irqs off */
static void imx_stop_rx(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand All @@ -402,9 +398,7 @@ static void imx_stop_rx(struct uart_port *port)
writel(temp & ~UCR1_RRDYEN, sport->port.membase + UCR1);
}

/*
* Set the modem control timer to fire immediately.
*/
/* called with port.lock taken and irqs off */
static void imx_enable_ms(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand All @@ -415,6 +409,8 @@ static void imx_enable_ms(struct uart_port *port)
}

static void imx_dma_tx(struct imx_port *sport);

/* called with port.lock taken and irqs off */
static inline void imx_transmit_buffer(struct imx_port *sport)
{
struct circ_buf *xmit = &sport->port.state->xmit;
Expand Down Expand Up @@ -501,6 +497,7 @@ static void dma_tx_callback(void *data)
spin_unlock_irqrestore(&sport->port.lock, flags);
}

/* called with port.lock taken and irqs off */
static void imx_dma_tx(struct imx_port *sport)
{
struct circ_buf *xmit = &sport->port.state->xmit;
Expand Down Expand Up @@ -557,9 +554,7 @@ static void imx_dma_tx(struct imx_port *sport)
return;
}

/*
* interrupts disabled on entry
*/
/* called with port.lock taken and irqs off */
static void imx_start_tx(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand Down Expand Up @@ -850,6 +845,7 @@ static unsigned int imx_tx_empty(struct uart_port *port)
return ret;
}

/* called with port.lock taken and irqs off */
static unsigned int imx_get_mctrl(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand All @@ -860,6 +856,7 @@ static unsigned int imx_get_mctrl(struct uart_port *port)
return ret;
}

/* called with port.lock taken and irqs off */
static void imx_set_mctrl(struct uart_port *port, unsigned int mctrl)
{
struct imx_port *sport = (struct imx_port *)port;
Expand Down Expand Up @@ -1364,6 +1361,7 @@ static void imx_shutdown(struct uart_port *port)
clk_disable_unprepare(sport->clk_ipg);
}

/* called with port.lock taken and irqs off */
static void imx_flush_buffer(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
Expand Down Expand Up @@ -1689,6 +1687,7 @@ static void imx_poll_put_char(struct uart_port *port, unsigned char c)
}
#endif

/* called with port.lock taken and irqs off or from .probe without locking */
static int imx_rs485_config(struct uart_port *port,
struct serial_rs485 *rs485conf)
{
Expand Down

0 comments on commit 6aed2a8

Please sign in to comment.