Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a427c179 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

USB: usb_wwan: 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: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 02803542

drivers/usb/serial/option.c

+0 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,6 @@ static struct usb_serial_driver option_1port_device = { 
	.write             = usb_wwan_write,

	.write_room        = usb_wwan_write_room,

	.chars_in_buffer   = usb_wwan_chars_in_buffer,

	.set_termios       = usb_wwan_set_termios,

	.tiocmget          = usb_wwan_tiocmget,

	.tiocmset          = usb_wwan_tiocmset,

	.ioctl             = usb_wwan_ioctl,

drivers/usb/serial/usb-wwan.h

+0 −3
Original line number Diff line number Diff line
@@ -11,9 +11,6 @@ extern void usb_wwan_close(struct usb_serial_port *port); 
extern int usb_wwan_port_probe(struct usb_serial_port *port);

extern int usb_wwan_port_remove(struct usb_serial_port *port);

extern int usb_wwan_write_room(struct tty_struct *tty);

extern void usb_wwan_set_termios(struct tty_struct *tty,

				 struct usb_serial_port *port,

				 struct ktermios *old);

extern int usb_wwan_tiocmget(struct tty_struct *tty);

extern int usb_wwan_tiocmset(struct tty_struct *tty,

			     unsigned int set, unsigned int clear);

drivers/usb/serial/usb_wwan.c

+0 −14
Original line number Diff line number Diff line
@@ -55,20 +55,6 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on) 
}

EXPORT_SYMBOL(usb_wwan_dtr_rts);



void usb_wwan_set_termios(struct tty_struct *tty,

			  struct usb_serial_port *port,

			  struct ktermios *old_termios)

{

	struct usb_wwan_intf_private *intfdata = port->serial->private;



	/* Doesn't support option setting */

	tty_termios_copy_hw(&tty->termios, old_termios);



	if (intfdata->send_setup)

		intfdata->send_setup(port);

}

EXPORT_SYMBOL(usb_wwan_set_termios);



int usb_wwan_tiocmget(struct tty_struct *tty)

{

	struct usb_serial_port *port = tty->driver_data;