diff options
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index c3bea46e87f..735ea03157a 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -49,7 +49,6 @@ static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *, | |||
49 | static void cp210x_break_ctl(struct tty_struct *, int); | 49 | static void cp210x_break_ctl(struct tty_struct *, int); |
50 | static int cp210x_startup(struct usb_serial *); | 50 | static int cp210x_startup(struct usb_serial *); |
51 | static void cp210x_dtr_rts(struct usb_serial_port *p, int on); | 51 | static void cp210x_dtr_rts(struct usb_serial_port *p, int on); |
52 | static int cp210x_carrier_raised(struct usb_serial_port *p); | ||
53 | 52 | ||
54 | static int debug; | 53 | static int debug; |
55 | 54 | ||
@@ -166,8 +165,7 @@ static struct usb_serial_driver cp210x_device = { | |||
166 | .tiocmget = cp210x_tiocmget, | 165 | .tiocmget = cp210x_tiocmget, |
167 | .tiocmset = cp210x_tiocmset, | 166 | .tiocmset = cp210x_tiocmset, |
168 | .attach = cp210x_startup, | 167 | .attach = cp210x_startup, |
169 | .dtr_rts = cp210x_dtr_rts, | 168 | .dtr_rts = cp210x_dtr_rts |
170 | .carrier_raised = cp210x_carrier_raised | ||
171 | }; | 169 | }; |
172 | 170 | ||
173 | /* Config request types */ | 171 | /* Config request types */ |
@@ -766,15 +764,6 @@ static int cp210x_tiocmget (struct tty_struct *tty, struct file *file) | |||
766 | return result; | 764 | return result; |
767 | } | 765 | } |
768 | 766 | ||
769 | static int cp210x_carrier_raised(struct usb_serial_port *p) | ||
770 | { | ||
771 | unsigned int control; | ||
772 | cp210x_get_config(p, CP210X_GET_MDMSTS, &control, 1); | ||
773 | if (control & CONTROL_DCD) | ||
774 | return 1; | ||
775 | return 0; | ||
776 | } | ||
777 | |||
778 | static void cp210x_break_ctl (struct tty_struct *tty, int break_state) | 767 | static void cp210x_break_ctl (struct tty_struct *tty, int break_state) |
779 | { | 768 | { |
780 | struct usb_serial_port *port = tty->driver_data; | 769 | struct usb_serial_port *port = tty->driver_data; |