diff options
| author | Alan Cox | 2011-02-14 17:27:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-02-17 20:59:14 +0100 |
| commit | 00a0d0d65b61241a718d0aee96f46b9a2d93bf26 (patch) | |
| tree | edca1d6b83d92fcce4c4c48d6308057f99c35a37 /drivers/usb/serial/ch341.c | |
| parent | tiocmset: kill the file pointer argument (diff) | |
| download | kernel-qcow2-linux-00a0d0d65b61241a718d0aee96f46b9a2d93bf26.tar.gz kernel-qcow2-linux-00a0d0d65b61241a718d0aee96f46b9a2d93bf26.tar.xz kernel-qcow2-linux-00a0d0d65b61241a718d0aee96f46b9a2d93bf26.zip | |
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/ch341.c')
| -rw-r--r-- | drivers/usb/serial/ch341.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) return 0; } -/*static int ch341_ioctl(struct usb_serial_port *port, struct file *file,*/ -static int ch341_ioctl(struct tty_struct *tty, struct file *file, +static int ch341_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) { struct usb_serial_port *port = tty->driver_data; |