diff options
Diffstat (limited to 'drivers/staging/serqt_usb2/serqt_usb2.c')
-rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 79 |
1 files changed, 7 insertions, 72 deletions
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index ae1d815e2a5..43045db982d 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c @@ -41,13 +41,6 @@ static bool debug; #define QUATECH_HSU200B 0xC0B1 /* HSU200B */ #define QUATECH_HSU200C 0xC0B2 /* HSU200C */ #define QUATECH_HSU200D 0xC0B3 /* HSU200D */ -#define QUATECH_SSU100_2 0xC120 /* SSU100_2 */ -#define QUATECH_DSU100_2 0xC140 /* DSU100_2 */ -#define QUATECH_DSU400_2 0xC150 /* DSU400_2 */ -#define QUATECH_QSU100_2 0xC160 /* QSU100_2 */ -#define QUATECH_QSU400_2 0xC170 /* QSU400_2 */ -#define QUATECH_ESU400_2 0xC180 /* ESU400_2 */ -#define QUATECH_ESU100_2 0xC1A0 /* ESU100_2 */ #define QT_SET_GET_DEVICE 0xc2 #define QT_OPEN_CLOSE_CHANNEL 0xca @@ -125,7 +118,7 @@ static bool debug; #define MODEM_CTRL 0x40 #define RS232_MODE 0x00 -static const struct usb_device_id serqt_id_table[] = { +static const struct usb_device_id id_table[] = { {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU200)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU100)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU200)}, @@ -143,17 +136,9 @@ static const struct usb_device_id serqt_id_table[] = { {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_HSU200B)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_HSU200C)}, {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_HSU200D)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_SSU100_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU100_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_DSU400_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_QSU100_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_QSU400_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_ESU400_2)}, - {USB_DEVICE(USB_VENDOR_ID_QUATECH, QUATECH_ESU100_2)}, {} /* Terminating entry */ }; - -MODULE_DEVICE_TABLE(usb, serqt_id_table); +MODULE_DEVICE_TABLE(usb, id_table); struct qt_get_device_data { __u8 porta; @@ -195,13 +180,6 @@ struct quatech_port { char closePending; }; -static struct usb_driver serqt_usb_driver = { - .name = "quatech-usb-serial", - .probe = usb_serial_probe, - .disconnect = usb_serial_disconnect, - .id_table = serqt_id_table, -}; - static int port_paranoia_check(struct usb_serial_port *port, const char *function) { @@ -304,8 +282,6 @@ static void qt_write_bulk_callback(struct urb *urb) quatech_port = urb->context; - dbg("%s - port %d\n", __func__, quatech_port->port_num); - tty = tty_port_tty_get(&quatech_port->port->port); if (tty) @@ -351,7 +327,6 @@ static void qt_read_bulk_callback(struct urb *urb) /* index = MINOR(port->tty->device) - serial->minor; */ index = tty->index - serial->minor; - dbg("%s - port %d\n", __func__, port->number); dbg("%s - port->RxHolding = %d\n", __func__, qt_port->RxHolding); if (port_paranoia_check(port, __func__) != 0) { @@ -726,8 +701,6 @@ static int qt_startup(struct usb_serial *serial) int i; int status; - dbg("enterting %s", __func__); - /* Now setup per port private data */ for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; @@ -855,8 +828,6 @@ static void qt_release(struct usb_serial *serial) struct quatech_port *qt_port; int i; - dbg("enterting %s", __func__); - for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; if (!port) @@ -882,8 +853,6 @@ static int qt_open(struct tty_struct *tty, if (port_paranoia_check(port, __func__)) return -ENODEV; - dbg("%s - port %d\n", __func__, port->number); - serial = port->serial; if (serial_paranoia_check(serial, __func__)) @@ -1006,8 +975,6 @@ static int qt_chars_in_buffer(struct tty_struct *tty) serial = get_usb_serial(port, __func__); - dbg("%s - port %d\n", __func__, port->number); - if (serial->num_bulk_out) { if (port->write_urb->status == -EINPROGRESS) chars = port->write_urb->transfer_buffer_length; @@ -1054,8 +1021,6 @@ static void qt_close(struct usb_serial_port *port) unsigned int index; status = 0; - dbg("%s - port %d\n", __func__, port->number); - tty = tty_port_tty_get(&port->port); index = tty->index - serial->minor; @@ -1109,8 +1074,6 @@ static int qt_write(struct tty_struct *tty, struct usb_serial_port *port, if (serial == NULL) return -ENODEV; - dbg("%s - port %d\n", __func__, port->number); - if (count == 0) { dbg("%s - write request of 0 bytes\n", __func__); return 0; @@ -1173,8 +1136,6 @@ static int qt_write_room(struct tty_struct *tty) mutex_lock(&qt_port->lock); - dbg("%s - port %d\n", __func__, port->number); - if (serial->num_bulk_out) { if (port->write_urb->status != -EINPROGRESS) retval = port->bulk_out_size; @@ -1241,8 +1202,6 @@ static void qt_set_termios(struct tty_struct *tty, int baud, divisor, remainder; int status; - dbg("%s", __func__); - index = tty->index - port->serial->minor; switch (cflag) { @@ -1365,8 +1324,6 @@ static void qt_break(struct tty_struct *tty, int break_state) mutex_lock(&qt_port->lock); - dbg("%s - port %d\n", __func__, port->number); - result = usb_control_msg(serial->dev, usb_sndctrlpipe(serial->dev, 0), QT_BREAK_CONTROL, 0x40, onoff, index, NULL, 0, 300); @@ -1385,8 +1342,6 @@ static inline int qt_real_tiocmget(struct tty_struct *tty, int status; unsigned int index; - dbg("%s - port %d, tty =0x%p\n", __func__, port->number, tty); - index = tty->index - serial->minor; status = BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr); @@ -1426,8 +1381,6 @@ static inline int qt_real_tiocmset(struct tty_struct *tty, int status; unsigned int index; - dbg("%s - port %d\n", __func__, port->number); - index = tty->index - serial->minor; status = BoxGetRegister(port->serial, index, MODEM_CONTROL_REGISTER, &mcr); @@ -1461,18 +1414,11 @@ static int qt_tiocmget(struct tty_struct *tty) struct quatech_port *qt_port = qt_get_port_private(port); int retval = -ENODEV; - dbg("In %s\n", __func__); - if (!serial) return -ENODEV; mutex_lock(&qt_port->lock); - - dbg("%s - port %d\n", __func__, port->number); - dbg("%s - port->RxHolding = %d\n", __func__, qt_port->RxHolding); - retval = qt_real_tiocmget(tty, port, serial); - mutex_unlock(&qt_port->lock); return retval; } @@ -1486,18 +1432,11 @@ static int qt_tiocmset(struct tty_struct *tty, struct quatech_port *qt_port = qt_get_port_private(port); int retval = -ENODEV; - dbg("In %s\n", __func__); - if (!serial) return -ENODEV; mutex_lock(&qt_port->lock); - - dbg("%s - port %d\n", __func__, port->number); - dbg("%s - qt_port->RxHolding = %d\n", __func__, qt_port->RxHolding); - retval = qt_real_tiocmset(tty, port, serial, set); - mutex_unlock(&qt_port->lock); return retval; } @@ -1508,8 +1447,6 @@ static void qt_throttle(struct tty_struct *tty) struct usb_serial *serial = get_usb_serial(port, __func__); struct quatech_port *qt_port; - dbg("%s - port %d\n", __func__, port->number); - if (!serial) return; @@ -1519,7 +1456,6 @@ static void qt_throttle(struct tty_struct *tty) /* pass on to the driver specific version of this function */ qt_port->RxHolding = 1; - dbg("%s - port->RxHolding = 1\n", __func__); mutex_unlock(&qt_port->lock); return; @@ -1539,8 +1475,6 @@ static void qt_unthrottle(struct tty_struct *tty) mutex_lock(&qt_port->lock); - dbg("%s - port %d\n", __func__, port->number); - if (qt_port->RxHolding == 1) { dbg("%s -qt_port->RxHolding == 1\n", __func__); @@ -1559,8 +1493,9 @@ static void qt_unthrottle(struct tty_struct *tty) qt_read_bulk_callback, port); result = usb_submit_urb(port->read_urb, GFP_ATOMIC); if (result) - err("%s - failed restarting read urb, error %d", - __func__, result); + dev_err(&port->dev, + "%s - failed restarting read urb, error %d\n", + __func__, result); } } mutex_unlock(&qt_port->lock); @@ -1589,7 +1524,7 @@ static struct usb_serial_driver quatech_device = { .name = "serqt", }, .description = DRIVER_DESC, - .id_table = serqt_id_table, + .id_table = id_table, .num_ports = 8, .open = qt_open, .close = qt_close, @@ -1612,7 +1547,7 @@ static struct usb_serial_driver * const serial_drivers[] = { &quatech_device, NULL }; -module_usb_serial_driver(serqt_usb_driver, serial_drivers); +module_usb_serial_driver(serial_drivers, id_table); MODULE_AUTHOR(DRIVER_AUTHOR); MODULE_DESCRIPTION(DRIVER_DESC); |