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

index caa0746..cb7aac9 100644 (file)
@@ -328,42 +328,23 @@ static int opticon_tiocmset(struct tty_struct *tty,
        return 0;
 }
 
        return 0;
 }
 
-static int get_serial_info(struct usb_serial_port *port,
-                          struct serial_struct __user *serial)
+static int get_serial_info(struct tty_struct *tty,
+                          struct serial_struct *ss)
 {
 {
-       struct serial_struct tmp;
-
-       memset(&tmp, 0x00, sizeof(tmp));
+       struct usb_serial_port *port = tty->driver_data;
 
        /* fake emulate a 16550 uart to make userspace code happy */
 
        /* fake emulate a 16550 uart to make userspace code happy */
-       tmp.type                = PORT_16550A;
-       tmp.line                = port->minor;
-       tmp.port                = 0;
-       tmp.irq                 = 0;
-       tmp.xmit_fifo_size      = 1024;
-       tmp.baud_base           = 9600;
-       tmp.close_delay         = 5*HZ;
-       tmp.closing_wait        = 30*HZ;
-
-       if (copy_to_user(serial, &tmp, sizeof(*serial)))
-               return -EFAULT;
+       ss->type                = PORT_16550A;
+       ss->line                = port->minor;
+       ss->port                = 0;
+       ss->irq                 = 0;
+       ss->xmit_fifo_size      = 1024;
+       ss->baud_base           = 9600;
+       ss->close_delay         = 5*HZ;
+       ss->closing_wait        = 30*HZ;
        return 0;
 }
 
        return 0;
 }
 
-static int opticon_ioctl(struct tty_struct *tty,
-                        unsigned int cmd, unsigned long arg)
-{
-       struct usb_serial_port *port = tty->driver_data;
-
-       switch (cmd) {
-       case TIOCGSERIAL:
-               return get_serial_info(port,
-                                      (struct serial_struct __user *)arg);
-       }
-
-       return -ENOIOCTLCMD;
-}
-
 static int opticon_port_probe(struct usb_serial_port *port)
 {
        struct opticon_private *priv;
 static int opticon_port_probe(struct usb_serial_port *port)
 {
        struct opticon_private *priv;
@@ -404,7 +385,7 @@ static struct usb_serial_driver opticon_device = {
        .write_room =           opticon_write_room,
        .throttle =             usb_serial_generic_throttle,
        .unthrottle =           usb_serial_generic_unthrottle,
        .write_room =           opticon_write_room,
        .throttle =             usb_serial_generic_throttle,
        .unthrottle =           usb_serial_generic_unthrottle,
-       .ioctl =                opticon_ioctl,
+       .get_serial =           get_serial_info,
        .tiocmget =             opticon_tiocmget,
        .tiocmset =             opticon_tiocmset,
        .process_read_urb =     opticon_process_read_urb,
        .tiocmget =             opticon_tiocmget,
        .tiocmset =             opticon_tiocmset,
        .process_read_urb =     opticon_process_read_urb,