tty: amiserial: drop broken alt-speed support

Setting an alt_speed using the ASYNC_SPD flags has been deprecated since
v2.1.69, and has been broken since v3.10 and commit 6865ff222cca ("TTY:
do not warn about setting speed via SPD_*") without anyone noticing.

Drop the broken alt-speed handling altogether, and add a ratelimited
warning about using TIOCCSERIAL to change speed as being deprecated.

Note that using ASYNC_SPD_CUST is still supported.

Signed-off-by: Johan Hovold <johan@kernel.org>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index dea16bb8c46a35b14604472fdf84a795d8fe3b51..9820e20993db14e024438bd6ad33966059ab32a3 100644 (file)
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -569,18 +569,6 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
        clear_bit(TTY_IO_ERROR, &tty->flags);
        info->xmit.head = info->xmit.tail = 0;
 
-       /*
-        * Set up the tty->alt_speed kludge
-        */
-       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-               tty->alt_speed = 57600;
-       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-               tty->alt_speed = 115200;
-       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-               tty->alt_speed = 230400;
-       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-               tty->alt_speed = 460800;
-
        /*
         * and set the speed of the serial port
         */
@@ -1084,14 +1072,9 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
 check_and_exit:
        if (tty_port_initialized(port)) {
                if (change_spd) {
-                       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
-                               tty->alt_speed = 57600;
-                       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)
-                               tty->alt_speed = 115200;
-                       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)
-                               tty->alt_speed = 230400;
-                       if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)
-                               tty->alt_speed = 460800;
+                       /* warn about deprecation unless clearing */
+                       if (new_serial.flags & ASYNC_SPD_MASK)
+                               dev_warn_ratelimited(tty->dev, "use of SPD flags is deprecated\n");
                        change_speed(tty, state, NULL);
                }
        } else