diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/quatech_usb2/quatech_usb2.c | 2 | ||||
-rw-r--r-- | drivers/staging/serqt_usb2/serqt_usb2.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ark3116.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ch341.c | 3 | ||||
-rw-r--r-- | drivers/usb/serial/cypress_m8.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/io_edgeport.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/io_ti.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/kobil_sct.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/mos7720.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/mos7840.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/opticon.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/oti6858.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/pl2303.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/spcp8x5.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ssu100.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/ti_usb_3410_5052.c | 4 | ||||
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb-wwan.h | 2 | ||||
-rw-r--r-- | drivers/usb/serial/usb_wwan.c | 2 | ||||
-rw-r--r-- | drivers/usb/serial/whiteheat.c | 4 |
21 files changed, 28 insertions, 29 deletions
diff --git a/drivers/staging/quatech_usb2/quatech_usb2.c b/drivers/staging/quatech_usb2/quatech_usb2.c index 3734448d1b82..36b18e302718 100644 --- a/drivers/staging/quatech_usb2/quatech_usb2.c +++ b/drivers/staging/quatech_usb2/quatech_usb2.c | |||
@@ -852,7 +852,7 @@ static int qt2_chars_in_buffer(struct tty_struct *tty) | |||
852 | * TIOCMGET and TIOCMSET are filtered off to their own methods before they get | 852 | * TIOCMGET and TIOCMSET are filtered off to their own methods before they get |
853 | * here, so we don't have to handle them. | 853 | * here, so we don't have to handle them. |
854 | */ | 854 | */ |
855 | static int qt2_ioctl(struct tty_struct *tty, struct file *file, | 855 | static int qt2_ioctl(struct tty_struct *tty, |
856 | unsigned int cmd, unsigned long arg) | 856 | unsigned int cmd, unsigned long arg) |
857 | { | 857 | { |
858 | struct usb_serial_port *port = tty->driver_data; | 858 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/staging/serqt_usb2/serqt_usb2.c b/drivers/staging/serqt_usb2/serqt_usb2.c index 39776c1cf10f..e0aae86a8809 100644 --- a/drivers/staging/serqt_usb2/serqt_usb2.c +++ b/drivers/staging/serqt_usb2/serqt_usb2.c | |||
@@ -1191,7 +1191,7 @@ static int qt_write_room(struct tty_struct *tty) | |||
1191 | 1191 | ||
1192 | } | 1192 | } |
1193 | 1193 | ||
1194 | static int qt_ioctl(struct tty_struct *tty, struct file *file, | 1194 | static int qt_ioctl(struct tty_struct *tty, |
1195 | unsigned int cmd, unsigned long arg) | 1195 | unsigned int cmd, unsigned long arg) |
1196 | { | 1196 | { |
1197 | struct usb_serial_port *port = tty->driver_data; | 1197 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index 2f837e983339..5cdb9d912275 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
@@ -431,7 +431,7 @@ static int ark3116_get_icount(struct tty_struct *tty, | |||
431 | return 0; | 431 | return 0; |
432 | } | 432 | } |
433 | 433 | ||
434 | static int ark3116_ioctl(struct tty_struct *tty, struct file *file, | 434 | static int ark3116_ioctl(struct tty_struct *tty, |
435 | unsigned int cmd, unsigned long arg) | 435 | unsigned int cmd, unsigned long arg) |
436 | { | 436 | { |
437 | struct usb_serial_port *port = tty->driver_data; | 437 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 5cbef313281e..d0b9feac5dc3 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
@@ -552,8 +552,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) | |||
552 | return 0; | 552 | return 0; |
553 | } | 553 | } |
554 | 554 | ||
555 | /*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/ | 555 | static int ch341_ioctl(struct tty_struct *tty, |
556 | static int ch341_ioctl(struct tty_struct *tty, struct file *file, | ||
557 | unsigned int cmd, unsigned long arg) | 556 | unsigned int cmd, unsigned long arg) |
558 | { | 557 | { |
559 | struct usb_serial_port *port = tty->driver_data; | 558 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c index 2beb5a66180d..987e9bf7bd02 100644 --- a/drivers/usb/serial/cypress_m8.c +++ b/drivers/usb/serial/cypress_m8.c | |||
@@ -169,7 +169,7 @@ static int cypress_write(struct tty_struct *tty, struct usb_serial_port *port, | |||
169 | const unsigned char *buf, int count); | 169 | const unsigned char *buf, int count); |
170 | static void cypress_send(struct usb_serial_port *port); | 170 | static void cypress_send(struct usb_serial_port *port); |
171 | static int cypress_write_room(struct tty_struct *tty); | 171 | static int cypress_write_room(struct tty_struct *tty); |
172 | static int cypress_ioctl(struct tty_struct *tty, struct file *file, | 172 | static int cypress_ioctl(struct tty_struct *tty, |
173 | unsigned int cmd, unsigned long arg); | 173 | unsigned int cmd, unsigned long arg); |
174 | static void cypress_set_termios(struct tty_struct *tty, | 174 | static void cypress_set_termios(struct tty_struct *tty, |
175 | struct usb_serial_port *port, struct ktermios *old); | 175 | struct usb_serial_port *port, struct ktermios *old); |
@@ -917,7 +917,7 @@ static int cypress_tiocmset(struct tty_struct *tty, | |||
917 | } | 917 | } |
918 | 918 | ||
919 | 919 | ||
920 | static int cypress_ioctl(struct tty_struct *tty, struct file *file, | 920 | static int cypress_ioctl(struct tty_struct *tty, |
921 | unsigned int cmd, unsigned long arg) | 921 | unsigned int cmd, unsigned long arg) |
922 | { | 922 | { |
923 | struct usb_serial_port *port = tty->driver_data; | 923 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index f521ab1eb60f..e3e23a4e227d 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -859,7 +859,7 @@ static void ftdi_set_termios(struct tty_struct *tty, | |||
859 | static int ftdi_tiocmget(struct tty_struct *tty); | 859 | static int ftdi_tiocmget(struct tty_struct *tty); |
860 | static int ftdi_tiocmset(struct tty_struct *tty, | 860 | static int ftdi_tiocmset(struct tty_struct *tty, |
861 | unsigned int set, unsigned int clear); | 861 | unsigned int set, unsigned int clear); |
862 | static int ftdi_ioctl(struct tty_struct *tty, struct file *file, | 862 | static int ftdi_ioctl(struct tty_struct *tty, |
863 | unsigned int cmd, unsigned long arg); | 863 | unsigned int cmd, unsigned long arg); |
864 | static void ftdi_break_ctl(struct tty_struct *tty, int break_state); | 864 | static void ftdi_break_ctl(struct tty_struct *tty, int break_state); |
865 | 865 | ||
@@ -2210,7 +2210,7 @@ static int ftdi_tiocmset(struct tty_struct *tty, | |||
2210 | return update_mctrl(port, set, clear); | 2210 | return update_mctrl(port, set, clear); |
2211 | } | 2211 | } |
2212 | 2212 | ||
2213 | static int ftdi_ioctl(struct tty_struct *tty, struct file *file, | 2213 | static int ftdi_ioctl(struct tty_struct *tty, |
2214 | unsigned int cmd, unsigned long arg) | 2214 | unsigned int cmd, unsigned long arg) |
2215 | { | 2215 | { |
2216 | struct usb_serial_port *port = tty->driver_data; | 2216 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/io_edgeport.c b/drivers/usb/serial/io_edgeport.c index 0b8846e27a79..ae91bcdcb2bc 100644 --- a/drivers/usb/serial/io_edgeport.c +++ b/drivers/usb/serial/io_edgeport.c | |||
@@ -216,7 +216,7 @@ static void edge_unthrottle(struct tty_struct *tty); | |||
216 | static void edge_set_termios(struct tty_struct *tty, | 216 | static void edge_set_termios(struct tty_struct *tty, |
217 | struct usb_serial_port *port, | 217 | struct usb_serial_port *port, |
218 | struct ktermios *old_termios); | 218 | struct ktermios *old_termios); |
219 | static int edge_ioctl(struct tty_struct *tty, struct file *file, | 219 | static int edge_ioctl(struct tty_struct *tty, |
220 | unsigned int cmd, unsigned long arg); | 220 | unsigned int cmd, unsigned long arg); |
221 | static void edge_break(struct tty_struct *tty, int break_state); | 221 | static void edge_break(struct tty_struct *tty, int break_state); |
222 | static int edge_tiocmget(struct tty_struct *tty); | 222 | static int edge_tiocmget(struct tty_struct *tty); |
@@ -1679,7 +1679,7 @@ static int get_serial_info(struct edgeport_port *edge_port, | |||
1679 | * SerialIoctl | 1679 | * SerialIoctl |
1680 | * this function handles any ioctl calls to the driver | 1680 | * this function handles any ioctl calls to the driver |
1681 | *****************************************************************************/ | 1681 | *****************************************************************************/ |
1682 | static int edge_ioctl(struct tty_struct *tty, struct file *file, | 1682 | static int edge_ioctl(struct tty_struct *tty, |
1683 | unsigned int cmd, unsigned long arg) | 1683 | unsigned int cmd, unsigned long arg) |
1684 | { | 1684 | { |
1685 | struct usb_serial_port *port = tty->driver_data; | 1685 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c index 88120523710b..d8434910fa7b 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c | |||
@@ -2552,7 +2552,7 @@ static int get_serial_info(struct edgeport_port *edge_port, | |||
2552 | return 0; | 2552 | return 0; |
2553 | } | 2553 | } |
2554 | 2554 | ||
2555 | static int edge_ioctl(struct tty_struct *tty, struct file *file, | 2555 | static int edge_ioctl(struct tty_struct *tty, |
2556 | unsigned int cmd, unsigned long arg) | 2556 | unsigned int cmd, unsigned long arg) |
2557 | { | 2557 | { |
2558 | struct usb_serial_port *port = tty->driver_data; | 2558 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 22cd0c08f46f..667863ef0625 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c | |||
@@ -75,7 +75,7 @@ static void kobil_close(struct usb_serial_port *port); | |||
75 | static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port, | 75 | static int kobil_write(struct tty_struct *tty, struct usb_serial_port *port, |
76 | const unsigned char *buf, int count); | 76 | const unsigned char *buf, int count); |
77 | static int kobil_write_room(struct tty_struct *tty); | 77 | static int kobil_write_room(struct tty_struct *tty); |
78 | static int kobil_ioctl(struct tty_struct *tty, struct file *file, | 78 | static int kobil_ioctl(struct tty_struct *tty, |
79 | unsigned int cmd, unsigned long arg); | 79 | unsigned int cmd, unsigned long arg); |
80 | static int kobil_tiocmget(struct tty_struct *tty); | 80 | static int kobil_tiocmget(struct tty_struct *tty); |
81 | static int kobil_tiocmset(struct tty_struct *tty, | 81 | static int kobil_tiocmset(struct tty_struct *tty, |
@@ -668,7 +668,7 @@ static void kobil_set_termios(struct tty_struct *tty, | |||
668 | ); | 668 | ); |
669 | } | 669 | } |
670 | 670 | ||
671 | static int kobil_ioctl(struct tty_struct *tty, struct file *file, | 671 | static int kobil_ioctl(struct tty_struct *tty, |
672 | unsigned int cmd, unsigned long arg) | 672 | unsigned int cmd, unsigned long arg) |
673 | { | 673 | { |
674 | struct usb_serial_port *port = tty->driver_data; | 674 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index 95b1c64cac03..d8b3e8fa14e9 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c | |||
@@ -1987,7 +1987,7 @@ static int get_serial_info(struct moschip_port *mos7720_port, | |||
1987 | return 0; | 1987 | return 0; |
1988 | } | 1988 | } |
1989 | 1989 | ||
1990 | static int mos7720_ioctl(struct tty_struct *tty, struct file *file, | 1990 | static int mos7720_ioctl(struct tty_struct *tty, |
1991 | unsigned int cmd, unsigned long arg) | 1991 | unsigned int cmd, unsigned long arg) |
1992 | { | 1992 | { |
1993 | struct usb_serial_port *port = tty->driver_data; | 1993 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 9424178c6689..7b50aa122752 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c | |||
@@ -2235,7 +2235,7 @@ static int mos7840_get_icount(struct tty_struct *tty, | |||
2235 | * this function handles any ioctl calls to the driver | 2235 | * this function handles any ioctl calls to the driver |
2236 | *****************************************************************************/ | 2236 | *****************************************************************************/ |
2237 | 2237 | ||
2238 | static int mos7840_ioctl(struct tty_struct *tty, struct file *file, | 2238 | static int mos7840_ioctl(struct tty_struct *tty, |
2239 | unsigned int cmd, unsigned long arg) | 2239 | unsigned int cmd, unsigned long arg) |
2240 | { | 2240 | { |
2241 | struct usb_serial_port *port = tty->driver_data; | 2241 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index e305df807396..8d603a1ca2eb 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
@@ -396,7 +396,7 @@ static int get_serial_info(struct opticon_private *priv, | |||
396 | return 0; | 396 | return 0; |
397 | } | 397 | } |
398 | 398 | ||
399 | static int opticon_ioctl(struct tty_struct *tty, struct file *file, | 399 | static int opticon_ioctl(struct tty_struct *tty, |
400 | unsigned int cmd, unsigned long arg) | 400 | unsigned int cmd, unsigned long arg) |
401 | { | 401 | { |
402 | struct usb_serial_port *port = tty->driver_data; | 402 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 63734cb0fb0f..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); |
@@ -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; |
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c index b797992fa54b..30461fcc2206 100644 --- a/drivers/usb/serial/pl2303.c +++ b/drivers/usb/serial/pl2303.c | |||
@@ -606,7 +606,7 @@ static int wait_modem_info(struct usb_serial_port *port, unsigned int arg) | |||
606 | return 0; | 606 | return 0; |
607 | } | 607 | } |
608 | 608 | ||
609 | static int pl2303_ioctl(struct tty_struct *tty, struct file *file, | 609 | static int pl2303_ioctl(struct tty_struct *tty, |
610 | unsigned int cmd, unsigned long arg) | 610 | unsigned int cmd, unsigned long arg) |
611 | { | 611 | { |
612 | struct serial_struct ser; | 612 | struct serial_struct ser; |
diff --git a/drivers/usb/serial/spcp8x5.c b/drivers/usb/serial/spcp8x5.c index dfbc543e0db8..180ea6c7911c 100644 --- a/drivers/usb/serial/spcp8x5.c +++ b/drivers/usb/serial/spcp8x5.c | |||
@@ -576,7 +576,7 @@ static int spcp8x5_wait_modem_info(struct usb_serial_port *port, | |||
576 | return 0; | 576 | return 0; |
577 | } | 577 | } |
578 | 578 | ||
579 | static int spcp8x5_ioctl(struct tty_struct *tty, struct file *file, | 579 | static int spcp8x5_ioctl(struct tty_struct *tty, |
580 | unsigned int cmd, unsigned long arg) | 580 | unsigned int cmd, unsigned long arg) |
581 | { | 581 | { |
582 | struct usb_serial_port *port = tty->driver_data; | 582 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/ssu100.c b/drivers/usb/serial/ssu100.c index abceee9d3af9..87362e48796e 100644 --- a/drivers/usb/serial/ssu100.c +++ b/drivers/usb/serial/ssu100.c | |||
@@ -439,7 +439,7 @@ static int ssu100_get_icount(struct tty_struct *tty, | |||
439 | 439 | ||
440 | 440 | ||
441 | 441 | ||
442 | static int ssu100_ioctl(struct tty_struct *tty, struct file *file, | 442 | static int ssu100_ioctl(struct tty_struct *tty, |
443 | unsigned int cmd, unsigned long arg) | 443 | unsigned int cmd, unsigned long arg) |
444 | { | 444 | { |
445 | struct usb_serial_port *port = tty->driver_data; | 445 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/ti_usb_3410_5052.c b/drivers/usb/serial/ti_usb_3410_5052.c index c7fea4a2a1be..f4a57ad27db8 100644 --- a/drivers/usb/serial/ti_usb_3410_5052.c +++ b/drivers/usb/serial/ti_usb_3410_5052.c | |||
@@ -106,7 +106,7 @@ static int ti_write_room(struct tty_struct *tty); | |||
106 | static int ti_chars_in_buffer(struct tty_struct *tty); | 106 | static int ti_chars_in_buffer(struct tty_struct *tty); |
107 | static void ti_throttle(struct tty_struct *tty); | 107 | static void ti_throttle(struct tty_struct *tty); |
108 | static void ti_unthrottle(struct tty_struct *tty); | 108 | static void ti_unthrottle(struct tty_struct *tty); |
109 | static int ti_ioctl(struct tty_struct *tty, struct file *file, | 109 | static int ti_ioctl(struct tty_struct *tty, |
110 | unsigned int cmd, unsigned long arg); | 110 | unsigned int cmd, unsigned long arg); |
111 | static int ti_get_icount(struct tty_struct *tty, | 111 | static int ti_get_icount(struct tty_struct *tty, |
112 | struct serial_icounter_struct *icount); | 112 | struct serial_icounter_struct *icount); |
@@ -818,7 +818,7 @@ static int ti_get_icount(struct tty_struct *tty, | |||
818 | return 0; | 818 | return 0; |
819 | } | 819 | } |
820 | 820 | ||
821 | static int ti_ioctl(struct tty_struct *tty, struct file *file, | 821 | static int ti_ioctl(struct tty_struct *tty, |
822 | unsigned int cmd, unsigned long arg) | 822 | unsigned int cmd, unsigned long arg) |
823 | { | 823 | { |
824 | struct usb_serial_port *port = tty->driver_data; | 824 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index dab679e5b7ea..b1110e136c33 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -417,7 +417,7 @@ static int serial_ioctl(struct tty_struct *tty, struct file *file, | |||
417 | /* pass on to the driver specific version of this function | 417 | /* pass on to the driver specific version of this function |
418 | if it is available */ | 418 | if it is available */ |
419 | if (port->serial->type->ioctl) { | 419 | if (port->serial->type->ioctl) { |
420 | retval = port->serial->type->ioctl(tty, file, cmd, arg); | 420 | retval = port->serial->type->ioctl(tty, cmd, arg); |
421 | } else | 421 | } else |
422 | retval = -ENOIOCTLCMD; | 422 | retval = -ENOIOCTLCMD; |
423 | return retval; | 423 | return retval; |
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h index 4d65f1c8dd93..c47b6ec03063 100644 --- a/drivers/usb/serial/usb-wwan.h +++ b/drivers/usb/serial/usb-wwan.h | |||
@@ -18,7 +18,7 @@ extern void usb_wwan_set_termios(struct tty_struct *tty, | |||
18 | extern int usb_wwan_tiocmget(struct tty_struct *tty); | 18 | extern int usb_wwan_tiocmget(struct tty_struct *tty); |
19 | extern int usb_wwan_tiocmset(struct tty_struct *tty, | 19 | extern int usb_wwan_tiocmset(struct tty_struct *tty, |
20 | unsigned int set, unsigned int clear); | 20 | unsigned int set, unsigned int clear); |
21 | extern int usb_wwan_ioctl(struct tty_struct *tty, struct file *file, | 21 | extern int usb_wwan_ioctl(struct tty_struct *tty, |
22 | unsigned int cmd, unsigned long arg); | 22 | unsigned int cmd, unsigned long arg); |
23 | extern int usb_wwan_send_setup(struct usb_serial_port *port); | 23 | extern int usb_wwan_send_setup(struct usb_serial_port *port); |
24 | extern int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, | 24 | extern int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port, |
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index b72912027ae8..b38d77b389d4 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c | |||
@@ -178,7 +178,7 @@ static int set_serial_info(struct usb_serial_port *port, | |||
178 | return retval; | 178 | return retval; |
179 | } | 179 | } |
180 | 180 | ||
181 | int usb_wwan_ioctl(struct tty_struct *tty, struct file *file, | 181 | int usb_wwan_ioctl(struct tty_struct *tty, |
182 | unsigned int cmd, unsigned long arg) | 182 | unsigned int cmd, unsigned long arg) |
183 | { | 183 | { |
184 | struct usb_serial_port *port = tty->driver_data; | 184 | struct usb_serial_port *port = tty->driver_data; |
diff --git a/drivers/usb/serial/whiteheat.c b/drivers/usb/serial/whiteheat.c index 6e0c397e869f..5b073bcc807b 100644 --- a/drivers/usb/serial/whiteheat.c +++ b/drivers/usb/serial/whiteheat.c | |||
@@ -152,7 +152,7 @@ static int whiteheat_write(struct tty_struct *tty, | |||
152 | struct usb_serial_port *port, | 152 | struct usb_serial_port *port, |
153 | const unsigned char *buf, int count); | 153 | const unsigned char *buf, int count); |
154 | static int whiteheat_write_room(struct tty_struct *tty); | 154 | static int whiteheat_write_room(struct tty_struct *tty); |
155 | static int whiteheat_ioctl(struct tty_struct *tty, struct file *file, | 155 | static int whiteheat_ioctl(struct tty_struct *tty, |
156 | unsigned int cmd, unsigned long arg); | 156 | unsigned int cmd, unsigned long arg); |
157 | static void whiteheat_set_termios(struct tty_struct *tty, | 157 | static void whiteheat_set_termios(struct tty_struct *tty, |
158 | struct usb_serial_port *port, struct ktermios *old); | 158 | struct usb_serial_port *port, struct ktermios *old); |
@@ -874,7 +874,7 @@ static int whiteheat_tiocmset(struct tty_struct *tty, | |||
874 | } | 874 | } |
875 | 875 | ||
876 | 876 | ||
877 | static int whiteheat_ioctl(struct tty_struct *tty, struct file *file, | 877 | static int whiteheat_ioctl(struct tty_struct *tty, |
878 | unsigned int cmd, unsigned long arg) | 878 | unsigned int cmd, unsigned long arg) |
879 | { | 879 | { |
880 | struct usb_serial_port *port = tty->driver_data; | 880 | struct usb_serial_port *port = tty->driver_data; |