quatech2: switch to ->get_serial()
authorAl Viro <viro@zeniv.linux.org.uk>
Wed, 12 Sep 2018 11:24:37 +0000 (07:24 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sat, 13 Oct 2018 04:50:40 +0000 (00:50 -0400)
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
drivers/usb/serial/quatech2.c

index b61c2a9..f2fbe1e 100644 (file)
@@ -453,39 +453,19 @@ static void qt2_disconnect(struct usb_serial *serial)
        usb_kill_urb(serial_priv->read_urb);
 }
 
        usb_kill_urb(serial_priv->read_urb);
 }
 
-static int get_serial_info(struct usb_serial_port *port,
-                          struct serial_struct __user *retinfo)
-{
-       struct serial_struct tmp;
-
-       memset(&tmp, 0, sizeof(tmp));
-       tmp.line                = port->minor;
-       tmp.port                = 0;
-       tmp.irq                 = 0;
-       tmp.xmit_fifo_size      = port->bulk_out_size;
-       tmp.baud_base           = 9600;
-       tmp.close_delay         = 5*HZ;
-       tmp.closing_wait        = 30*HZ;
-
-       if (copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
-               return -EFAULT;
-       return 0;
-}
-
-static int qt2_ioctl(struct tty_struct *tty,
-                    unsigned int cmd, unsigned long arg)
+static int get_serial_info(struct tty_struct *tty,
+                          struct serial_struct *ss)
 {
        struct usb_serial_port *port = tty->driver_data;
 
 {
        struct usb_serial_port *port = tty->driver_data;
 
-       switch (cmd) {
-       case TIOCGSERIAL:
-               return get_serial_info(port,
-                                      (struct serial_struct __user *)arg);
-       default:
-               break;
-       }
-
-       return -ENOIOCTLCMD;
+       ss->line                = port->minor;
+       ss->port                = 0;
+       ss->irq                 = 0;
+       ss->xmit_fifo_size      = port->bulk_out_size;
+       ss->baud_base           = 9600;
+       ss->close_delay         = 5*HZ;
+       ss->closing_wait        = 30*HZ;
+       return 0;
 }
 
 static void qt2_process_status(struct usb_serial_port *port, unsigned char *ch)
 }
 
 static void qt2_process_status(struct usb_serial_port *port, unsigned char *ch)
@@ -1013,7 +993,7 @@ static struct usb_serial_driver qt2_device = {
        .tiocmset            = qt2_tiocmset,
        .tiocmiwait          = usb_serial_generic_tiocmiwait,
        .get_icount          = usb_serial_generic_get_icount,
        .tiocmset            = qt2_tiocmset,
        .tiocmiwait          = usb_serial_generic_tiocmiwait,
        .get_icount          = usb_serial_generic_get_icount,
-       .ioctl               = qt2_ioctl,
+       .get_serial          = get_serial_info,
        .set_termios         = qt2_set_termios,
 };
 
        .set_termios         = qt2_set_termios,
 };