summaryrefslogtreecommitdiff
path: root/Documentation/serial
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-05-11 13:56:05 +0200
committerJonathan Corbet <corbet@lwn.net>2016-05-14 10:18:25 -0600
commitb79ef07d205c6504e701b48380d33fe2bab78ec5 (patch)
tree46520ab3352bb27fedba77ab1588fa482862a041 /Documentation/serial
parent95f981f2e3b9a27ea2eb744b6861a3b9c81a1fde (diff)
serial: doc: Use port->state instead of info
As of commit ebd2c8f6d2ec4012 ("serial: kill off uart_info"), the circular transmission buffer is part of struct uart_state instead of struct uart_info. Make it clear this structure is pointed to from struct uart_port. Change 'circ' to 'circ_buf' to match the structure name while we're at it. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/serial')
-rw-r--r--Documentation/serial/driver8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/serial/driver b/Documentation/serial/driver
index 90889c785809..da193e092fc3 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -48,8 +48,8 @@ data:
port->mctrl
port->icount
- info->xmit.head (circ->head)
- info->xmit.tail (circ->tail)
+ port->state->xmit.head (circ_buf->head)
+ port->state->xmit.tail (circ_buf->tail)
The low level driver is free to use this lock to provide any additional
locking.
@@ -204,7 +204,7 @@ hardware.
RTS nor DTR; this will have already been done via a separate
call to set_mctrl.
- Drivers must not access port->info once this call has completed.
+ Drivers must not access port->state once this call has completed.
This method will only be called when there are no more users of
this port.
@@ -216,7 +216,7 @@ hardware.
Flush any write buffers, reset any DMA state and stop any
ongoing DMA transfers.
- This will be called whenever the port->info->xmit circular
+ This will be called whenever the port->state->xmit circular
buffer is cleared.
Locking: port->lock taken.