diff options
Diffstat (limited to 'drivers/usb/serial/cp210x.c')
-rw-r--r-- | drivers/usb/serial/cp210x.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index b3873815035c..4df3e0cecbae 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c | |||
@@ -42,9 +42,8 @@ static void cp210x_get_termios_port(struct usb_serial_port *port, | |||
42 | static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, | 42 | static void cp210x_set_termios(struct tty_struct *, struct usb_serial_port *, |
43 | struct ktermios*); | 43 | struct ktermios*); |
44 | static int cp210x_tiocmget(struct tty_struct *); | 44 | static int cp210x_tiocmget(struct tty_struct *); |
45 | static int cp210x_tiocmset(struct tty_struct *, struct file *, | 45 | static int cp210x_tiocmset(struct tty_struct *, unsigned int, unsigned int); |
46 | unsigned int, unsigned int); | 46 | static int cp210x_tiocmset_port(struct usb_serial_port *port, |
47 | static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *, | ||
48 | unsigned int, unsigned int); | 47 | unsigned int, unsigned int); |
49 | static void cp210x_break_ctl(struct tty_struct *, int); | 48 | static void cp210x_break_ctl(struct tty_struct *, int); |
50 | static int cp210x_startup(struct usb_serial *); | 49 | static int cp210x_startup(struct usb_serial *); |
@@ -698,14 +697,14 @@ static void cp210x_set_termios(struct tty_struct *tty, | |||
698 | 697 | ||
699 | } | 698 | } |
700 | 699 | ||
701 | static int cp210x_tiocmset (struct tty_struct *tty, struct file *file, | 700 | static int cp210x_tiocmset (struct tty_struct *tty, |
702 | unsigned int set, unsigned int clear) | 701 | unsigned int set, unsigned int clear) |
703 | { | 702 | { |
704 | struct usb_serial_port *port = tty->driver_data; | 703 | struct usb_serial_port *port = tty->driver_data; |
705 | return cp210x_tiocmset_port(port, file, set, clear); | 704 | return cp210x_tiocmset_port(port, set, clear); |
706 | } | 705 | } |
707 | 706 | ||
708 | static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *file, | 707 | static int cp210x_tiocmset_port(struct usb_serial_port *port, |
709 | unsigned int set, unsigned int clear) | 708 | unsigned int set, unsigned int clear) |
710 | { | 709 | { |
711 | unsigned int control = 0; | 710 | unsigned int control = 0; |
@@ -737,9 +736,9 @@ static int cp210x_tiocmset_port(struct usb_serial_port *port, struct file *file, | |||
737 | static void cp210x_dtr_rts(struct usb_serial_port *p, int on) | 736 | static void cp210x_dtr_rts(struct usb_serial_port *p, int on) |
738 | { | 737 | { |
739 | if (on) | 738 | if (on) |
740 | cp210x_tiocmset_port(p, NULL, TIOCM_DTR|TIOCM_RTS, 0); | 739 | cp210x_tiocmset_port(p, TIOCM_DTR|TIOCM_RTS, 0); |
741 | else | 740 | else |
742 | cp210x_tiocmset_port(p, NULL, 0, TIOCM_DTR|TIOCM_RTS); | 741 | cp210x_tiocmset_port(p, 0, TIOCM_DTR|TIOCM_RTS); |
743 | } | 742 | } |
744 | 743 | ||
745 | static int cp210x_tiocmget (struct tty_struct *tty) | 744 | static int cp210x_tiocmget (struct tty_struct *tty) |