aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-05-11 07:56:04 -0400
committerJonathan Corbet <corbet@lwn.net>2016-05-14 12:18:19 -0400
commit95f981f2e3b9a27ea2eb744b6861a3b9c81a1fde (patch)
treefb6862487573e7fb45b6c8e04c00930898df0771
parent30955e71fc2bd1b966ce6531285ac59ae653819f (diff)
serial: doc: Always refer to tty_port->mutex
Stop referring to the mutex member of the tty_port struct as 'port->mutex', as 'port' is ambiguous, and usually refers to the uart_port struct in this document. Use 'tty_port->mutex' instead, following the single existing use. 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 39701515832b..90889c785809 100644
--- a/Documentation/serial/driver
+++ b/Documentation/serial/driver
@@ -57,7 +57,7 @@ locking.
57The port_sem semaphore is used to protect against ports being added/ 57The port_sem semaphore is used to protect against ports being added/
58removed or reconfigured at inappropriate times. Since v2.6.27, this 58removed or reconfigured at inappropriate times. Since v2.6.27, this
59semaphore has been the 'mutex' member of the tty_port struct, and 59semaphore has been the 'mutex' member of the tty_port struct, and
60commonly referred to as the port mutex (or port->mutex). 60commonly referred to as the port mutex.
61 61
62 62
63uart_ops 63uart_ops
@@ -186,7 +186,7 @@ hardware.
186 should be terminated when another call is made with a zero 186 should be terminated when another call is made with a zero
187 ctl. 187 ctl.
188 188
189 Locking: caller holds port->mutex 189 Locking: caller holds tty_port->mutex
190 190
191 startup(port) 191 startup(port)
192 Grab any interrupt resources and initialise any low level driver 192 Grab any interrupt resources and initialise any low level driver
@@ -262,14 +262,14 @@ hardware.
262 Other flags may be used (eg, xon/xoff characters) if your 262 Other flags may be used (eg, xon/xoff characters) if your
263 hardware supports hardware "soft" flow control. 263 hardware supports hardware "soft" flow control.
264 264
265 Locking: caller holds port->mutex 265 Locking: caller holds tty_port->mutex
266 Interrupts: caller dependent. 266 Interrupts: caller dependent.
267 This call must not sleep 267 This call must not sleep
268 268
269 set_ldisc(port,termios) 269 set_ldisc(port,termios)
270 Notifier for discipline change. See Documentation/serial/tty.txt. 270 Notifier for discipline change. See Documentation/serial/tty.txt.
271 271
272 Locking: caller holds port->mutex 272 Locking: caller holds tty_port->mutex
273 273
274 pm(port,state,oldstate) 274 pm(port,state,oldstate)
275 Perform any power management related activities on the specified 275 Perform any power management related activities on the specified