USB: serial: whiteheat: fix TIOCGSERIAL implementation

TIOCSSERIAL is a horrid, underspecified, legacy interface which for most
serial devices is only useful for setting the close_delay and
closing_wait parameters.

The port parameter is used to set the I/O port and does not make any
sense to use for USB serial devices.

The xmit_fifo_size parameter could be used to set the hardware transmit
fifo size of a legacy UART when it could not be detected, but the
interface is limited to eight bits and should be left unset when not
used.

The close_delay and closing_wait parameters returned by TIOCGSERIAL are
specified in centiseconds (not jiffies). The driver does not yet support
changing these, but let's report back the default values actually used
(0.5 and 30 seconds, respectively).

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

diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c
index ccfd5ed..c8b10fa 100644 (file)
--- a/drivers/usb/serial/whiteheat.c
+++ b/drivers/usb/serial/whiteheat.c
@@ -170,7 +170,6 @@ static int firm_report_tx_done(struct usb_serial_port *port);
 #define COMMAND_PORT           4
 #define COMMAND_TIMEOUT                (2*HZ)  /* 2 second timeout for a command */
 #define        COMMAND_TIMEOUT_MS      2000
-#define CLOSING_DELAY          (30 * HZ)
 
 
 /*****************************************************************************
@@ -447,12 +446,9 @@ static int whiteheat_get_serial(struct tty_struct *tty,
 
        ss->type = PORT_16654;
        ss->line = port->minor;
-       ss->port = port->port_number;
-       ss->xmit_fifo_size = kfifo_size(&port->write_fifo);
-       ss->custom_divisor = 0;
        ss->baud_base = 460800;
-       ss->close_delay = CLOSING_DELAY;
-       ss->closing_wait = CLOSING_DELAY;
+       ss->close_delay = 50;
+       ss->closing_wait = 3000;
 
        return 0;
 }