aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/tty.h
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-09-10 15:06:34 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-09-24 00:19:35 -0400
commit136d5258b2bc4ffae99cb69874a76624c26fbfad (patch)
tree1699143576355e462091a5701b2814dc1d2d1d71 /include/linux/tty.h
parentc545b66c6922b002b5fe224a6eaec58c913650b5 (diff)
tty: Move and rename send_prio_char() as tty_send_xchar()
Relocate the file-scope function, send_prio_char(), as a global helper tty_send_xchar(). Remove the global declarations for tty_write_lock()/tty_write_unlock(), as these are file-scope only now. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/tty.h')
-rw-r--r--include/linux/tty.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h
index d80b53642f2c..4c6b9fd3c750 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -418,6 +418,7 @@ extern void tty_unregister_device(struct tty_driver *driver, unsigned index);
418extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp, 418extern int tty_read_raw_data(struct tty_struct *tty, unsigned char *bufp,
419 int buflen); 419 int buflen);
420extern void tty_write_message(struct tty_struct *tty, char *msg); 420extern void tty_write_message(struct tty_struct *tty, char *msg);
421extern int tty_send_xchar(struct tty_struct *tty, char ch);
421extern int tty_put_char(struct tty_struct *tty, unsigned char c); 422extern int tty_put_char(struct tty_struct *tty, unsigned char c);
422extern int tty_chars_in_buffer(struct tty_struct *tty); 423extern int tty_chars_in_buffer(struct tty_struct *tty);
423extern int tty_write_room(struct tty_struct *tty); 424extern int tty_write_room(struct tty_struct *tty);
@@ -502,8 +503,6 @@ extern struct tty_struct *tty_pair_get_pty(struct tty_struct *tty);
502extern struct mutex tty_mutex; 503extern struct mutex tty_mutex;
503extern spinlock_t tty_files_lock; 504extern spinlock_t tty_files_lock;
504 505
505extern void tty_write_unlock(struct tty_struct *tty);
506extern int tty_write_lock(struct tty_struct *tty, int ndelay);
507#define tty_is_writelocked(tty) (mutex_is_locked(&tty->atomic_write_lock)) 506#define tty_is_writelocked(tty) (mutex_is_locked(&tty->atomic_write_lock))
508 507
509extern void tty_port_init(struct tty_port *port); 508extern void tty_port_init(struct tty_port *port);