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/oti6858.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/oti6858.c')
-rw-r--r-- | drivers/usb/serial/oti6858.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c index 3cece27325e7..e90f88a3b040 100644 --- a/drivers/usb/serial/oti6858.c +++ b/drivers/usb/serial/oti6858.c | |||
@@ -141,8 +141,7 @@ struct oti6858_control_pkt { | |||
141 | && ((a)->frame_fmt == (priv)->pending_setup.frame_fmt)) | 141 | && ((a)->frame_fmt == (priv)->pending_setup.frame_fmt)) |
142 | 142 | ||
143 | /* function prototypes */ | 143 | /* function prototypes */ |
144 | static int oti6858_open(struct tty_struct *tty, | 144 | static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port); |
145 | struct usb_serial_port *port, struct file *filp); | ||
146 | static void oti6858_close(struct usb_serial_port *port); | 145 | static void oti6858_close(struct usb_serial_port *port); |
147 | static void oti6858_set_termios(struct tty_struct *tty, | 146 | static void oti6858_set_termios(struct tty_struct *tty, |
148 | struct usb_serial_port *port, struct ktermios *old); | 147 | struct usb_serial_port *port, struct ktermios *old); |
@@ -566,8 +565,7 @@ static void oti6858_set_termios(struct tty_struct *tty, | |||
566 | spin_unlock_irqrestore(&priv->lock, flags); | 565 | spin_unlock_irqrestore(&priv->lock, flags); |
567 | } | 566 | } |
568 | 567 | ||
569 | static int oti6858_open(struct tty_struct *tty, | 568 | static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port) |
570 | struct usb_serial_port *port, struct file *filp) | ||
571 | { | 569 | { |
572 | struct oti6858_private *priv = usb_get_serial_port_data(port); | 570 | struct oti6858_private *priv = usb_get_serial_port_data(port); |
573 | struct ktermios tmp_termios; | 571 | struct ktermios tmp_termios; |