Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

quatech2: switch to ->get_serial()

Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Al Viro 8fbde798 9326ec59

+11 -31
+11 -31
drivers/usb/serial/quatech2.c
··· 453 453 usb_kill_urb(serial_priv->read_urb); 454 454 } 455 455 456 - static int get_serial_info(struct usb_serial_port *port, 457 - struct serial_struct __user *retinfo) 458 - { 459 - struct serial_struct tmp; 460 - 461 - memset(&tmp, 0, sizeof(tmp)); 462 - tmp.line = port->minor; 463 - tmp.port = 0; 464 - tmp.irq = 0; 465 - tmp.xmit_fifo_size = port->bulk_out_size; 466 - tmp.baud_base = 9600; 467 - tmp.close_delay = 5*HZ; 468 - tmp.closing_wait = 30*HZ; 469 - 470 - if (copy_to_user(retinfo, &tmp, sizeof(*retinfo))) 471 - return -EFAULT; 472 - return 0; 473 - } 474 - 475 - static int qt2_ioctl(struct tty_struct *tty, 476 - unsigned int cmd, unsigned long arg) 456 + static int get_serial_info(struct tty_struct *tty, 457 + struct serial_struct *ss) 477 458 { 478 459 struct usb_serial_port *port = tty->driver_data; 479 460 480 - switch (cmd) { 481 - case TIOCGSERIAL: 482 - return get_serial_info(port, 483 - (struct serial_struct __user *)arg); 484 - default: 485 - break; 486 - } 487 - 488 - return -ENOIOCTLCMD; 461 + ss->line = port->minor; 462 + ss->port = 0; 463 + ss->irq = 0; 464 + ss->xmit_fifo_size = port->bulk_out_size; 465 + ss->baud_base = 9600; 466 + ss->close_delay = 5*HZ; 467 + ss->closing_wait = 30*HZ; 468 + return 0; 489 469 } 490 470 491 471 static void qt2_process_status(struct usb_serial_port *port, unsigned char *ch) ··· 993 1013 .tiocmset = qt2_tiocmset, 994 1014 .tiocmiwait = usb_serial_generic_tiocmiwait, 995 1015 .get_icount = usb_serial_generic_get_icount, 996 - .ioctl = qt2_ioctl, 1016 + .get_serial = get_serial_info, 997 1017 .set_termios = qt2_set_termios, 998 1018 }; 999 1019