nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

cdc-acm: 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 23:33:40 -04:00
parent 81732b26e0
commit 99f75a1fcd
1 changed files with 14 additions and 27 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/usb/class/cdc-acm.c
View file

@ -956,37 +956,28 @@ static int acm_tty_tiocmset(struct tty_struct *tty,
return acm_set_control(acm, acm->ctrlout = newctrl); return acm_set_control(acm, acm->ctrlout = newctrl);
} }
static int get_serial_info(struct acm *acm, struct serial_struct __user *info) static int get_serial_info(struct tty_struct *tty, struct serial_struct *ss)
{ {
struct serial_struct tmp; struct acm *acm = tty->driver_data;
memset(&tmp, 0, sizeof(tmp)); ss->xmit_fifo_size = acm->writesize;
tmp.xmit_fifo_size = acm->writesize; ss->baud_base = le32_to_cpu(acm->line.dwDTERate);
tmp.baud_base = le32_to_cpu(acm->line.dwDTERate); ss->close_delay = acm->port.close_delay / 10;
tmp.close_delay = acm->port.close_delay / 10; ss->closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
tmp.closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
ASYNC_CLOSING_WAIT_NONE : ASYNC_CLOSING_WAIT_NONE :
acm->port.closing_wait / 10; acm->port.closing_wait / 10;
if (copy_to_user(info, &tmp, sizeof(tmp)))
return -EFAULT;
else
return 0; return 0;
} }
static int set_serial_info(struct acm *acm, static int set_serial_info(struct tty_struct *tty, struct serial_struct *ss)
struct serial_struct __user *newinfo)
{ {
struct serial_struct new_serial; struct acm *acm = tty->driver_data;
unsigned int closing_wait, close_delay; unsigned int closing_wait, close_delay;
int retval = 0; int retval = 0;
if (copy_from_user(&new_serial, newinfo, sizeof(new_serial))) close_delay = ss->close_delay * 10;
return -EFAULT; closing_wait = ss->closing_wait == ASYNC_CLOSING_WAIT_NONE ?
ASYNC_CLOSING_WAIT_NONE : ss->closing_wait * 10;
close_delay = new_serial.close_delay * 10;
closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
mutex_lock(&acm->port.mutex); mutex_lock(&acm->port.mutex);
@ -1071,12 +1062,6 @@ static int acm_tty_ioctl(struct tty_struct *tty,
int rv = -ENOIOCTLCMD; int rv = -ENOIOCTLCMD;
switch (cmd) { switch (cmd) {
case TIOCGSERIAL: /* gets serial port data */
rv = get_serial_info(acm, (struct serial_struct __user *) arg);
break;
case TIOCSSERIAL:
rv = set_serial_info(acm, (struct serial_struct __user *) arg);
break;
case TIOCMIWAIT: case TIOCMIWAIT:
rv = usb_autopm_get_interface(acm->control); rv = usb_autopm_get_interface(acm->control);
if (rv < 0) { if (rv < 0) {
@ -1998,6 +1983,8 @@ static const struct tty_operations acm_ops = {
.set_termios = acm_tty_set_termios, .set_termios = acm_tty_set_termios,
.tiocmget = acm_tty_tiocmget, .tiocmget = acm_tty_tiocmget,
.tiocmset = acm_tty_tiocmset, .tiocmset = acm_tty_tiocmset,
.get_serial = get_serial_info,
.set_serial = set_serial_info,
.get_icount = acm_tty_get_icount, .get_icount = acm_tty_get_icount,
}; };