redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

tty: rename the remaining oddly named n_tty functions

Browse source 
Original idea for this from a patch by Rodolfo Giometti which merges various
bits of PPS support

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Alan Cox 2008-10-13 10:46:24 +01:00 committed by Linus Torvalds
parent a18992d465
commit 11a96d1820
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/char/n_tty.c
View file

@ -26,7 +26,7 @@
* *
* 2002/03/18 Implemented n_tty_wakeup to send SIGIO POLL_OUTs to * 2002/03/18 Implemented n_tty_wakeup to send SIGIO POLL_OUTs to
* waiting writing processes-Sapan Bhatia <sapan@corewars.org>. * waiting writing processes-Sapan Bhatia <sapan@corewars.org>.
* Also fixed a bug in BLOCKING mode where write_chan returns * Also fixed a bug in BLOCKING mode where n_tty_write returns
* EAGAIN * EAGAIN
*/ */
@ -358,7 +358,7 @@ static int opost(unsigned char c, struct tty_struct *tty)
* the simple cases normally found and helps to generate blocks of * the simple cases normally found and helps to generate blocks of
* symbols for the console driver and thus improve performance. * symbols for the console driver and thus improve performance.
* *
* Called from write_chan under the tty layer write lock. Relies * Called from n_tty_write under the tty layer write lock. Relies
* on lock_kernel for the tty->column state. * on lock_kernel for the tty->column state.
*/ */
@ -1183,7 +1183,7 @@ static inline int input_available_p(struct tty_struct *tty, int amt)
* @b: user data * @b: user data
* @nr: size of data * @nr: size of data
* *
* Helper function to speed up read_chan. It is only called when * Helper function to speed up n_tty_read. It is only called when
* ICANON is off; it copies characters straight from the tty queue to * ICANON is off; it copies characters straight from the tty queue to
* user space directly. It can be profitably called twice; once to * user space directly. It can be profitably called twice; once to
* drain the space from the tail pointer to the (physical) end of the * drain the space from the tail pointer to the (physical) end of the
@ -1250,7 +1250,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
if (file->f_op->write != redirected_tty_write && if (file->f_op->write != redirected_tty_write &&
current->signal->tty == tty) { current->signal->tty == tty) {
if (!tty->pgrp) if (!tty->pgrp)
printk(KERN_ERR "read_chan: no tty->pgrp!\n"); printk(KERN_ERR "n_tty_read: no tty->pgrp!\n");
else if (task_pgrp(current) != tty->pgrp) { else if (task_pgrp(current) != tty->pgrp) {
if (is_ignored(SIGTTIN) || if (is_ignored(SIGTTIN) ||
is_current_pgrp_orphaned()) is_current_pgrp_orphaned())
@ -1265,7 +1265,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
/** /**
* read_chan - read function for tty * n_tty_read - read function for tty
* @tty: tty device * @tty: tty device
* @file: file object * @file: file object
* @buf: userspace buffer pointer * @buf: userspace buffer pointer
@ -1279,7 +1279,7 @@ static int job_control(struct tty_struct *tty, struct file *file)
* This code must be sure never to sleep through a hangup. * This code must be sure never to sleep through a hangup.
*/ */
static ssize_t read_chan(struct tty_struct *tty, struct file *file, static ssize_t n_tty_read(struct tty_struct *tty, struct file *file,
unsigned char __user *buf, size_t nr) unsigned char __user *buf, size_t nr)
{ {
unsigned char __user *b = buf; unsigned char __user *b = buf;
@ -1481,7 +1481,7 @@ do_it_again:
} }
/** /**
* write_chan - write function for tty * n_tty_write - write function for tty
* @tty: tty device * @tty: tty device
* @file: file object * @file: file object
* @buf: userspace buffer pointer * @buf: userspace buffer pointer
@ -1495,7 +1495,7 @@ do_it_again:
* This code must be sure never to sleep through a hangup. * This code must be sure never to sleep through a hangup.
*/ */
static ssize_t write_chan(struct tty_struct *tty, struct file *file, static ssize_t n_tty_write(struct tty_struct *tty, struct file *file,
const unsigned char *buf, size_t nr) const unsigned char *buf, size_t nr)
{ {
const unsigned char *b = buf; const unsigned char *b = buf;
@ -1569,7 +1569,7 @@ break_out:
} }
/** /**
* normal_poll - poll method for N_TTY * n_tty_poll - poll method for N_TTY
* @tty: terminal device * @tty: terminal device
* @file: file accessing it * @file: file accessing it
* @wait: poll table * @wait: poll table
@ -1582,7 +1582,7 @@ break_out:
* Called without the kernel lock held - fine * Called without the kernel lock held - fine
*/ */
static unsigned int normal_poll(struct tty_struct *tty, struct file *file, static unsigned int n_tty_poll(struct tty_struct *tty, struct file *file,
poll_table *wait) poll_table *wait)
{ {
unsigned int mask = 0; unsigned int mask = 0;
@ -1655,11 +1655,11 @@ struct tty_ldisc_ops tty_ldisc_N_TTY = {
.close = n_tty_close, .close = n_tty_close,
.flush_buffer = n_tty_flush_buffer, .flush_buffer = n_tty_flush_buffer,
.chars_in_buffer = n_tty_chars_in_buffer, .chars_in_buffer = n_tty_chars_in_buffer,
.read = read_chan, .read = n_tty_read,
.write = write_chan, .write = n_tty_write,
.ioctl = n_tty_ioctl, .ioctl = n_tty_ioctl,
.set_termios = n_tty_set_termios, .set_termios = n_tty_set_termios,
.poll = normal_poll, .poll = n_tty_poll,
.receive_buf = n_tty_receive_buf, .receive_buf = n_tty_receive_buf,
.write_wakeup = n_tty_write_wakeup .write_wakeup = n_tty_write_wakeup
}; };