aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-05-11 07:56:05 -0400
committerJonathan Corbet <corbet@lwn.net>2016-05-14 12:18:25 -0400
commitb79ef07d205c6504e701b48380d33fe2bab78ec5 (patch)
tree46520ab3352bb27fedba77ab1588fa482862a041
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>
-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:
48 48
49 port->mctrl 49 port->mctrl
50 port->icount 50 port->icount
51 info->xmit.head (circ->head) 51 port->state->xmit.head (circ_buf->head)
52 info->xmit.tail (circ->tail) 52 port->state->xmit.tail (circ_buf->tail)
53 53
54The low level driver is free to use this lock to provide any additional 54The low level driver is free to use this lock to provide any additional
55locking. 55locking.
@@ -204,7 +204,7 @@ hardware.
204 RTS nor DTR; this will have already been done via a separate 204 RTS nor DTR; this will have already been done via a separate
205 call to set_mctrl. 205 call to set_mctrl.
206 206
207 Drivers must not access port->info once this call has completed. 207 Drivers must not access port->state once this call has completed.
208 208
209 This method will only be called when there are no more users of 209 This method will only be called when there are no more users of
210 this port. 210 this port.
@@ -216,7 +216,7 @@ hardware.
216 Flush any write buffers, reset any DMA state and stop any 216 Flush any write buffers, reset any DMA state and stop any
217 ongoing DMA transfers. 217 ongoing DMA transfers.
218 218
219 This will be called whenever the port->info->xmit circular 219 This will be called whenever the port->state->xmit circular
220 buffer is cleared. 220 buffer is cleared.
221 221
222 Locking: port->lock taken. 222 Locking: port->lock taken.