From: Johan Hovold Date: Mon, 26 May 2014 17:23:01 +0000 (+0200) Subject: USB: sierra: remove unimplemented set_termios X-Git-Tag: next-20140530~20^2~129 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e825aaa0624ef5cc0aa06e3102ddfc9ed95c2e2c;p=karo-tx-linux.git USB: sierra: remove unimplemented set_termios The driver does not implement set_termios so the operation can be left unset (tty will do the tty_termios_copy_hw for us). Note that the send_setup call is bogus as it really only sets DTR/RTS to their current values. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index fa0b78ad42d7..854ac61581ba 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c @@ -372,13 +372,6 @@ static int sierra_send_setup(struct usb_serial_port *port) return retval; } -static void sierra_set_termios(struct tty_struct *tty, - struct usb_serial_port *port, struct ktermios *old_termios) -{ - tty_termios_copy_hw(&tty->termios, old_termios); - sierra_send_setup(port); -} - static int sierra_tiocmget(struct tty_struct *tty) { struct usb_serial_port *port = tty->driver_data; @@ -1079,7 +1072,6 @@ static struct usb_serial_driver sierra_device = { .write = sierra_write, .write_room = sierra_write_room, .chars_in_buffer = sierra_chars_in_buffer, - .set_termios = sierra_set_termios, .tiocmget = sierra_tiocmget, .tiocmset = sierra_tiocmset, .attach = sierra_startup,