diff options
author | Alan Cox <alan@linux.intel.com> | 2009-09-19 16:13:26 -0400 |
---|---|---|
committer | Live-CD User <linux@linux.site> | 2009-09-19 16:13:26 -0400 |
commit | a509a7e478e4766114d69f12d19d644ac63e9765 (patch) | |
tree | 2b994dabb7b97ceadac959f51d29ddf68216cb59 /drivers/usb/serial/option.c | |
parent | d3b5cffcf84a8bdc7073dce4745d67c72629af85 (diff) |
tty: USB does not need the filp argument in the drivers
And indeed none of them use it. Clean this up as it will make moving to a
standard open method rather easier.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/option.c')
-rw-r--r-- | drivers/usb/serial/option.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index c784ddbe7b61..fe47051dbef2 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
@@ -45,8 +45,7 @@ | |||
45 | /* Function prototypes */ | 45 | /* Function prototypes */ |
46 | static int option_probe(struct usb_serial *serial, | 46 | static int option_probe(struct usb_serial *serial, |
47 | const struct usb_device_id *id); | 47 | const struct usb_device_id *id); |
48 | static int option_open(struct tty_struct *tty, struct usb_serial_port *port, | 48 | static int option_open(struct tty_struct *tty, struct usb_serial_port *port); |
49 | struct file *filp); | ||
50 | static void option_close(struct usb_serial_port *port); | 49 | static void option_close(struct usb_serial_port *port); |
51 | static void option_dtr_rts(struct usb_serial_port *port, int on); | 50 | static void option_dtr_rts(struct usb_serial_port *port, int on); |
52 | 51 | ||
@@ -961,8 +960,7 @@ static int option_chars_in_buffer(struct tty_struct *tty) | |||
961 | return data_len; | 960 | return data_len; |
962 | } | 961 | } |
963 | 962 | ||
964 | static int option_open(struct tty_struct *tty, | 963 | static int option_open(struct tty_struct *tty, struct usb_serial_port *port) |
965 | struct usb_serial_port *port, struct file *filp) | ||
966 | { | 964 | { |
967 | struct option_port_private *portdata; | 965 | struct option_port_private *portdata; |
968 | int i, err; | 966 | int i, err; |