aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/serial/option.c1
-rw-r--r--drivers/usb/serial/usb-wwan.h3
-rw-r--r--drivers/usb/serial/usb_wwan.c14
3 files changed, 0 insertions, 18 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index df91ea9243df..51e30740b2fe 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -1729,7 +1729,6 @@ static struct usb_serial_driver option_1port_device = {
1729 .write = usb_wwan_write, 1729 .write = usb_wwan_write,
1730 .write_room = usb_wwan_write_room, 1730 .write_room = usb_wwan_write_room,
1731 .chars_in_buffer = usb_wwan_chars_in_buffer, 1731 .chars_in_buffer = usb_wwan_chars_in_buffer,
1732 .set_termios = usb_wwan_set_termios,
1733 .tiocmget = usb_wwan_tiocmget, 1732 .tiocmget = usb_wwan_tiocmget,
1734 .tiocmset = usb_wwan_tiocmset, 1733 .tiocmset = usb_wwan_tiocmset,
1735 .ioctl = usb_wwan_ioctl, 1734 .ioctl = usb_wwan_ioctl,
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
index aca45efbd674..dc379603c4b8 100644
--- a/drivers/usb/serial/usb-wwan.h
+++ b/drivers/usb/serial/usb-wwan.h
@@ -11,9 +11,6 @@ extern void usb_wwan_close(struct usb_serial_port *port);
11extern int usb_wwan_port_probe(struct usb_serial_port *port); 11extern int usb_wwan_port_probe(struct usb_serial_port *port);
12extern int usb_wwan_port_remove(struct usb_serial_port *port); 12extern int usb_wwan_port_remove(struct usb_serial_port *port);
13extern int usb_wwan_write_room(struct tty_struct *tty); 13extern int usb_wwan_write_room(struct tty_struct *tty);
14extern void usb_wwan_set_termios(struct tty_struct *tty,
15 struct usb_serial_port *port,
16 struct ktermios *old);
17extern int usb_wwan_tiocmget(struct tty_struct *tty); 14extern int usb_wwan_tiocmget(struct tty_struct *tty);
18extern int usb_wwan_tiocmset(struct tty_struct *tty, 15extern int usb_wwan_tiocmset(struct tty_struct *tty,
19 unsigned int set, unsigned int clear); 16 unsigned int set, unsigned int clear);
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 9aeaccfd4f74..aa45985520f7 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -55,20 +55,6 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
55} 55}
56EXPORT_SYMBOL(usb_wwan_dtr_rts); 56EXPORT_SYMBOL(usb_wwan_dtr_rts);
57 57
58void usb_wwan_set_termios(struct tty_struct *tty,
59 struct usb_serial_port *port,
60 struct ktermios *old_termios)
61{
62 struct usb_wwan_intf_private *intfdata = port->serial->private;
63
64 /* Doesn't support option setting */
65 tty_termios_copy_hw(&tty->termios, old_termios);
66
67 if (intfdata->send_setup)
68 intfdata->send_setup(port);
69}
70EXPORT_SYMBOL(usb_wwan_set_termios);
71
72int usb_wwan_tiocmget(struct tty_struct *tty) 58int usb_wwan_tiocmget(struct tty_struct *tty)
73{ 59{
74 struct usb_serial_port *port = tty->driver_data; 60 struct usb_serial_port *port = tty->driver_data;