diff options
Diffstat (limited to 'drivers/usb/serial/oti6858.c')
-rw-r--r-- | drivers/usb/serial/oti6858.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 73613205be7a..4c29e6c2bda7 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -135,7 +135,7 @@ static void oti6858_close(struct usb_serial_port *port); | |||
135 | static void oti6858_set_termios(struct tty_struct *tty, | 135 | static void oti6858_set_termios(struct tty_struct *tty, |
136 | struct usb_serial_port *port, struct ktermios *old); | 136 | struct usb_serial_port *port, struct ktermios *old); |
137 | static void oti6858_init_termios(struct tty_struct *tty); | 137 | static void oti6858_init_termios(struct tty_struct *tty); |
138 | static int oti6858_ioctl(struct tty_struct *tty, struct file *file, | 138 | static int oti6858_ioctl(struct tty_struct *tty, |
139 | unsigned int cmd, unsigned long arg); | 139 | unsigned int cmd, unsigned long arg); |
140 | static void oti6858_read_int_callback(struct urb *urb); | 140 | static void oti6858_read_int_callback(struct urb *urb); |
141 | static void oti6858_read_bulk_callback(struct urb *urb); | 141 | static void oti6858_read_bulk_callback(struct urb *urb); |
@@ -144,8 +144,8 @@ static int oti6858_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
144 | const unsigned char *buf, int count); | 144 | const unsigned char *buf, int count); |
145 | static int oti6858_write_room(struct tty_struct *tty); | 145 | static int oti6858_write_room(struct tty_struct *tty); |
146 | static int oti6858_chars_in_buffer(struct tty_struct *tty); | 146 | static int oti6858_chars_in_buffer(struct tty_struct *tty); |
147 | static int oti6858_tiocmget(struct tty_struct *tty, struct file *file); | 147 | static int oti6858_tiocmget(struct tty_struct *tty); |
148 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | 148 | static int oti6858_tiocmset(struct tty_struct *tty, |
149 | unsigned int set, unsigned int clear); | 149 | unsigned int set, unsigned int clear); |
150 | static int oti6858_startup(struct usb_serial *serial); | 150 | static int oti6858_startup(struct usb_serial *serial); |
151 | static void oti6858_release(struct usb_serial *serial); | 151 | static void oti6858_release(struct usb_serial *serial); |
@@ -624,7 +624,7 @@ static void oti6858_close(struct usb_serial_port *port) | |||
624 | usb_kill_urb(port->interrupt_in_urb); | 624 | usb_kill_urb(port->interrupt_in_urb); |
625 | } | 625 | } |
626 | 626 | ||
627 | static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | 627 | static int oti6858_tiocmset(struct tty_struct *tty, |
628 | unsigned int set, unsigned int clear) | 628 | unsigned int set, unsigned int clear) |
629 | { | 629 | { |
630 | struct usb_serial_port *port = tty->driver_data; | 630 | struct usb_serial_port *port = tty->driver_data; |
@@ -657,7 +657,7 @@ static int oti6858_tiocmset(struct tty_struct *tty, struct file *file, | |||
657 | return 0; | 657 | return 0; |
658 | } | 658 | } |
659 | 659 | ||
660 | static int oti6858_tiocmget(struct tty_struct *tty, struct file *file) | 660 | static int oti6858_tiocmget(struct tty_struct *tty) |
661 | { | 661 | { |
662 | struct usb_serial_port *port = tty->driver_data; | 662 | struct usb_serial_port *port = tty->driver_data; |
663 | struct oti6858_private *priv = usb_get_serial_port_data(port); | 663 | struct oti6858_private *priv = usb_get_serial_port_data(port); |
@@ -728,7 +728,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) | |||
728 | return 0; | 728 | return 0; |
729 | } | 729 | } |
730 | 730 | ||
731 | static int oti6858_ioctl(struct tty_struct *tty, struct file *file, | 731 | static int oti6858_ioctl(struct tty_struct *tty, |
732 | unsigned int cmd, unsigned long arg) | 732 | unsigned int cmd, unsigned long arg) |
733 | { | 733 | { |
734 | struct usb_serial_port *port = tty->driver_data; | 734 | struct usb_serial_port *port = tty->driver_data; |