niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

serial_core: switch to ->[sg]et_serial()

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2018-09-11 22:29:55 -04:00
parent 6da5b58763
commit 5099d234a5
1 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
drivers/tty/serial/serial_core.c
View file

@ -778,17 +778,13 @@ out:
return ret; return ret;
} }
static int uart_get_info_user(struct tty_port *port, static int uart_get_info_user(struct tty_struct *tty,
struct serial_struct __user *retinfo) struct serial_struct *ss)
{ {
struct serial_struct tmp; struct uart_state *state = tty->driver_data;
struct tty_port *port = &state->port;
if (uart_get_info(port, &tmp) < 0) return uart_get_info(port, ss) < 0 ? -EIO : 0;
return -EIO;
if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
return -EFAULT;
return 0;
} }
static int uart_set_info(struct tty_struct *tty, struct tty_port *port, static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
@ -990,16 +986,13 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
return retval; return retval;
} }
static int uart_set_info_user(struct tty_struct *tty, struct uart_state *state, static int uart_set_info_user(struct tty_struct *tty, struct serial_struct *ss)
struct serial_struct __user *newinfo)
{ {
struct serial_struct new_serial; struct uart_state *state = tty->driver_data;
struct tty_port *port = &state->port; struct tty_port *port = &state->port;
int retval; int retval;
if (copy_from_user(&new_serial, newinfo, sizeof(new_serial))) down_write(&tty->termios_rwsem);
return -EFAULT;
/* /*
* This semaphore protects port->count. It is also * This semaphore protects port->count. It is also
* very useful to prevent opens. Also, take the * very useful to prevent opens. Also, take the
@ -1008,8 +1001,9 @@ static int uart_set_info_user(struct tty_struct *tty, struct uart_state *state,
* under us. * under us.
*/ */
mutex_lock(&port->mutex); mutex_lock(&port->mutex);
retval = uart_set_info(tty, port, state, &new_serial); retval = uart_set_info(tty, port, state, ss);
mutex_unlock(&port->mutex); mutex_unlock(&port->mutex);
up_write(&tty->termios_rwsem);
return retval; return retval;
} }
@ -1325,16 +1319,6 @@ uart_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
* These ioctls don't rely on the hardware to be present. * These ioctls don't rely on the hardware to be present.
*/ */
switch (cmd) { switch (cmd) {
case TIOCGSERIAL:
ret = uart_get_info_user(port, uarg);
break;
case TIOCSSERIAL:
down_write(&tty->termios_rwsem);
ret = uart_set_info_user(tty, state, uarg);
up_write(&tty->termios_rwsem);
break;
case TIOCSERCONFIG: case TIOCSERCONFIG:
down_write(&tty->termios_rwsem); down_write(&tty->termios_rwsem);
ret = uart_do_autoconfig(tty, state); ret = uart_do_autoconfig(tty, state);
@ -2413,6 +2397,8 @@ static const struct tty_operations uart_ops = {
#endif #endif
.tiocmget = uart_tiocmget, .tiocmget = uart_tiocmget,
.tiocmset = uart_tiocmset, .tiocmset = uart_tiocmset,
.set_serial = uart_set_info_user,
.get_serial = uart_get_info_user,
.get_icount = uart_get_icount, .get_icount = uart_get_icount,
#ifdef CONFIG_CONSOLE_POLL #ifdef CONFIG_CONSOLE_POLL
.poll_init = uart_poll_init, .poll_init = uart_poll_init,