tty: Remove external interface for tty_set_termios()

tty_set_termios() is an internal helper intended for file scope use.

UART drivers which are capable of driving the RTS pin must
properly handle the tiocmset() method, regardless of termios settings.
A failure to do so is a UART driver bug and should be fixed there.
Do not use this interface to workaround UART driver bugs.

Cc: Johan Hedberg <johan.hedberg@gmail.com>
Cc: <linux-bluetooth@vger.kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index 2ff6dfd2d3f0..9c4dcf4c62ea 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -51,33 +51,22 @@ struct ath_struct {
 
 static int ath_wakeup_ar3k(struct tty_struct *tty)
 {
-        struct ktermios ktermios;
         int status = tty->driver->ops->tiocmget(tty);
 
         if (status & TIOCM_CTS)
                 return status;
 
-        /* Disable Automatic RTSCTS */
-        ktermios = tty->termios;
-        ktermios.c_cflag &= ~CRTSCTS;
-        tty_set_termios(tty, &ktermios);
-
         /* Clear RTS first */
-        status = tty->driver->ops->tiocmget(tty);
+        tty->driver->ops->tiocmget(tty);
         tty->driver->ops->tiocmset(tty, 0x00, TIOCM_RTS);
         mdelay(20);
 
         /* Set RTS, wake up board */
-        status = tty->driver->ops->tiocmget(tty);
+        tty->driver->ops->tiocmget(tty);
         tty->driver->ops->tiocmset(tty, TIOCM_RTS, 0x00);
         mdelay(20);
 
         status = tty->driver->ops->tiocmget(tty);
-
-        /* Enable Automatic RTSCTS */
-        ktermios.c_cflag |= CRTSCTS;
-        status = tty_set_termios(tty, &ktermios);
-
         return status;
 }