lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tiocmset: kill the file pointer argument

Browse Source 
Doing tiocmget was such fun we should do tiocmset as well for the same
reasons

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox
2011-02-14 16:26:50 +00:00
committed by Greg Kroah-Hartman
parent 60b33c133c
commit 20b9d17715
70 changed files with 120 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tty/serial/serial_core.c
View File

@ -925,8 +925,7 @@ static int uart_tiocmget(struct tty_struct *tty)
}
static int
uart_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
uart_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
{
struct uart_state *state = tty->driver_data;
struct uart_port *uport = state->uart_port;
@ -934,8 +933,7 @@ uart_tiocmset(struct tty_struct *tty, struct file *file,
int ret = -EIO;
mutex_lock(&port->mutex);
if ((!file || !tty_hung_up_p(file)) &&
!(tty->flags & (1 << TTY_IO_ERROR))) {
if (!(tty->flags & (1 << TTY_IO_ERROR))) {
uart_update_mctrl(uport, set, clear);
ret = 0;
}