@@ -342,9 +342,7 @@ static void imx_port_rts_auto(struct imx_port *sport, unsigned long *ucr2)
342
342
* ucr2 |= UCR2_CTSC ;
343
343
}
344
344
345
- /*
346
- * interrupts disabled on entry
347
- */
345
+ /* called with port.lock taken and irqs off */
348
346
static void imx_stop_tx (struct uart_port * port )
349
347
{
350
348
struct imx_port * sport = (struct imx_port * )port ;
@@ -377,9 +375,7 @@ static void imx_stop_tx(struct uart_port *port)
377
375
}
378
376
}
379
377
380
- /*
381
- * interrupts disabled on entry
382
- */
378
+ /* called with port.lock taken and irqs off */
383
379
static void imx_stop_rx (struct uart_port * port )
384
380
{
385
381
struct imx_port * sport = (struct imx_port * )port ;
@@ -402,9 +398,7 @@ static void imx_stop_rx(struct uart_port *port)
402
398
writel (temp & ~UCR1_RRDYEN , sport -> port .membase + UCR1 );
403
399
}
404
400
405
- /*
406
- * Set the modem control timer to fire immediately.
407
- */
401
+ /* called with port.lock taken and irqs off */
408
402
static void imx_enable_ms (struct uart_port * port )
409
403
{
410
404
struct imx_port * sport = (struct imx_port * )port ;
@@ -415,6 +409,8 @@ static void imx_enable_ms(struct uart_port *port)
415
409
}
416
410
417
411
static void imx_dma_tx (struct imx_port * sport );
412
+
413
+ /* called with port.lock taken and irqs off */
418
414
static inline void imx_transmit_buffer (struct imx_port * sport )
419
415
{
420
416
struct circ_buf * xmit = & sport -> port .state -> xmit ;
@@ -501,6 +497,7 @@ static void dma_tx_callback(void *data)
501
497
spin_unlock_irqrestore (& sport -> port .lock , flags );
502
498
}
503
499
500
+ /* called with port.lock taken and irqs off */
504
501
static void imx_dma_tx (struct imx_port * sport )
505
502
{
506
503
struct circ_buf * xmit = & sport -> port .state -> xmit ;
@@ -557,9 +554,7 @@ static void imx_dma_tx(struct imx_port *sport)
557
554
return ;
558
555
}
559
556
560
- /*
561
- * interrupts disabled on entry
562
- */
557
+ /* called with port.lock taken and irqs off */
563
558
static void imx_start_tx (struct uart_port * port )
564
559
{
565
560
struct imx_port * sport = (struct imx_port * )port ;
@@ -850,6 +845,7 @@ static unsigned int imx_tx_empty(struct uart_port *port)
850
845
return ret ;
851
846
}
852
847
848
+ /* called with port.lock taken and irqs off */
853
849
static unsigned int imx_get_mctrl (struct uart_port * port )
854
850
{
855
851
struct imx_port * sport = (struct imx_port * )port ;
@@ -860,6 +856,7 @@ static unsigned int imx_get_mctrl(struct uart_port *port)
860
856
return ret ;
861
857
}
862
858
859
+ /* called with port.lock taken and irqs off */
863
860
static void imx_set_mctrl (struct uart_port * port , unsigned int mctrl )
864
861
{
865
862
struct imx_port * sport = (struct imx_port * )port ;
@@ -1364,6 +1361,7 @@ static void imx_shutdown(struct uart_port *port)
1364
1361
clk_disable_unprepare (sport -> clk_ipg );
1365
1362
}
1366
1363
1364
+ /* called with port.lock taken and irqs off */
1367
1365
static void imx_flush_buffer (struct uart_port * port )
1368
1366
{
1369
1367
struct imx_port * sport = (struct imx_port * )port ;
@@ -1689,6 +1687,7 @@ static void imx_poll_put_char(struct uart_port *port, unsigned char c)
1689
1687
}
1690
1688
#endif
1691
1689
1690
+ /* called with port.lock taken and irqs off or from .probe without locking */
1692
1691
static int imx_rs485_config (struct uart_port * port ,
1693
1692
struct serial_rs485 * rs485conf )
1694
1693
{
0 commit comments