diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:27:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:59:14 -0500 |
commit | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (patch) | |
tree | edca1d6b83d92fcce4c4c48d6308057f99c35a37 /drivers/usb/serial/ftdi_sio.c | |
parent | 20b9d17715017ae4dd4ec87fabc36d33b9de708e (diff) |
tty: remove filp from the USB tty ioctls
We don't use it so we can trim it from here as we try and stamp the file
object dependencies out of the serial code.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |