USB: serial: ti_usb_3410_5052: switch to 30-second closing wait

Switch to using the system-wide default 30-second closing-wait timeout
instead of the driver specific 40-second timeout.

The timeout can be changed per port using TIOCSSERIAL (setserial) if
needed.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>

diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c
index 35cc1be738efba170aa0e49ee3b62350d2085871..03839289d6c0932f46ab14fe510655601b3b4906 100644 (file)
--- a/drivers/usb/serial/ti_usb_3410_5052.c
+++ b/drivers/usb/serial/ti_usb_3410_5052.c
@@ -270,8 +270,6 @@ struct ti_firmware_header {
 
 #define TI_TRANSFER_TIMEOUT    2
 
-#define TI_DEFAULT_CLOSING_WAIT        4000            /* in .01 secs */
-
 /* read urb states */
 #define TI_READ_URB_RUNNING    0
 #define TI_READ_URB_STOPPING   1
@@ -602,7 +600,6 @@ static int ti_port_probe(struct usb_serial_port *port)
                tport->tp_uart_base_addr = TI_UART1_BASE_ADDR;
        else
                tport->tp_uart_base_addr = TI_UART2_BASE_ADDR;
-       port->port.closing_wait = msecs_to_jiffies(10 * TI_DEFAULT_CLOSING_WAIT);
        tport->tp_port = port;
        tport->tp_tdev = usb_get_serial_data(port->serial);