The patch removes unused TIOCSSERIAL case from ioctl. TIOCGSERIAL case
 moves to the get_serial_info() function. Some magic numbers moves to
 #define directives.

Signed-off-by: Mikhail Zaytsev <flas...@mail.ru>
---
 drivers/usb/serial/ark3116.c | 54 ++++++++++++++++++++++++++------------------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c
index 23d46ef87..f45f69e18 100644
--- a/drivers/usb/serial/ark3116.c
+++ b/drivers/usb/serial/ark3116.c
@@ -36,13 +36,19 @@
 #define DRIVER_DESC "USB ARK3116 serial/IrDA driver"
 #define DRIVER_DEV_DESC "ARK3116 RS232/IrDA"
 #define DRIVER_NAME "ark3116"
+#define ARK3116_BAUDRATE 460800
+
+#define RS232_VENDOR 0x6547
+#define RS232_PRODUCT 0x0232
+#define IRDA_VENDOR 0x18ec
+#define IRDA_PRODUCT 0x3118
 
 /* usb timeout of 1 second */
 #define ARK_TIMEOUT 1000
 
 static const struct usb_device_id id_table[] = {
-       { USB_DEVICE(0x6547, 0x0232) },
-       { USB_DEVICE(0x18ec, 0x3118) },         /* USB to IrDA adapter */
+       { USB_DEVICE(RS232_VENDOR, RS232_PRODUCT) },
+       { USB_DEVICE(IRDA_VENDOR, IRDA_PRODUCT) },  /* USB to IrDA adapter */
        { },
 };
 MODULE_DEVICE_TABLE(usb, id_table);
@@ -50,8 +56,8 @@ MODULE_DEVICE_TABLE(usb, id_table);
 static int is_irda(struct usb_serial *serial)
 {
        struct usb_device *dev = serial->dev;
-       if (le16_to_cpu(dev->descriptor.idVendor) == 0x18ec &&
-                       le16_to_cpu(dev->descriptor.idProduct) == 0x3118)
+       if (le16_to_cpu(dev->descriptor.idVendor) == IRDA_VENDOR &&
+                       le16_to_cpu(dev->descriptor.idProduct) == IRDA_PRODUCT)
                return 1;
        return 0;
 }
@@ -397,31 +403,35 @@ static int ark3116_open(struct tty_struct *tty, struct 
usb_serial_port *port)
        return result;
 }
 
+static int ark3116_get_serial_info(struct usb_serial_port *port,
+                       unsigned long arg)
+{
+       struct serial_struct ser;
+
+       memset(&ser, 0, sizeof(ser));
+
+       ser.type = PORT_16654;
+       ser.line = port->minor;
+       ser.port = port->port_number;
+       ser.custom_divisor = 0;
+       ser.baud_base = ARK3116_BAUDRATE;
+
+       if (copy_to_user((void __user *)arg, &ser, sizeof(ser)))
+               return -EFAULT;
+
+       return 0;
+}
+
 static int ark3116_ioctl(struct tty_struct *tty,
                         unsigned int cmd, unsigned long arg)
 {
        struct usb_serial_port *port = tty->driver_data;
-       struct serial_struct serstruct;
-       void __user *user_arg = (void __user *)arg;
 
        switch (cmd) {
        case TIOCGSERIAL:
-               /* XXX: Some of these values are probably wrong. */
-               memset(&serstruct, 0, sizeof(serstruct));
-               serstruct.type = PORT_16654;
-               serstruct.line = port->minor;
-               serstruct.port = port->port_number;
-               serstruct.custom_divisor = 0;
-               serstruct.baud_base = 460800;
-
-               if (copy_to_user(user_arg, &serstruct, sizeof(serstruct)))
-                       return -EFAULT;
-
-               return 0;
-       case TIOCSSERIAL:
-               if (copy_from_user(&serstruct, user_arg, sizeof(serstruct)))
-                       return -EFAULT;
-               return 0;
+               return ark3116_get_serial_info(port, arg);
+       default:
+               break;
        }
 
        return -ENOIOCTLCMD;
-- 
2.11.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to