diff options
author | Alan Cox <alan@linux.intel.com> | 2011-02-14 11:26:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:52:43 -0500 |
commit | 20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch) | |
tree | 64e9c4ff845844298f9056357d9f4914802207f8 /drivers/usb/serial/digi_acceleport.c | |
parent | 60b33c133ca0b7c0b6072c87234b63fee6e80558 (diff) |
tiocmset: kill the file pointer argument
Doing tiocmget was such fun we should do tiocmset as well for the same
reasons
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/digi_acceleport.c')
-rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 08da46cb5825..86fbba6336c9 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c | |||
@@ -446,10 +446,10 @@ static void digi_set_termios(struct tty_struct *tty, | |||
446 | struct usb_serial_port *port, struct ktermios *old_termios); | 446 | struct usb_serial_port *port, struct ktermios *old_termios); |
447 | static void digi_break_ctl(struct tty_struct *tty, int break_state); | 447 | static void digi_break_ctl(struct tty_struct *tty, int break_state); |
448 | static int digi_tiocmget(struct tty_struct *tty); | 448 | static int digi_tiocmget(struct tty_struct *tty); |
449 | static int digi_tiocmset(struct tty_struct *tty, struct file *file, | 449 | static int digi_tiocmset(struct tty_struct *tty, unsigned int set, |
450 | unsigned int set, unsigned int clear); | 450 | unsigned int clear); |
451 | static int digi_write(struct tty_struct *tty, struct usb_serial_port *port, | 451 | static int digi_write(struct tty_struct *tty, struct usb_serial_port *port, |
452 | const unsigned char *buf, int count); | 452 | const unsigned char *buf, int count); |
453 | static void digi_write_bulk_callback(struct urb *urb); | 453 | static void digi_write_bulk_callback(struct urb *urb); |
454 | static int digi_write_room(struct tty_struct *tty); | 454 | static int digi_write_room(struct tty_struct *tty); |
455 | static int digi_chars_in_buffer(struct tty_struct *tty); | 455 | static int digi_chars_in_buffer(struct tty_struct *tty); |
@@ -1134,8 +1134,8 @@ static int digi_tiocmget(struct tty_struct *tty) | |||
1134 | } | 1134 | } |
1135 | 1135 | ||
1136 | 1136 | ||
1137 | static int digi_tiocmset(struct tty_struct *tty, struct file *file, | 1137 | static int digi_tiocmset(struct tty_struct *tty, |
1138 | unsigned int set, unsigned int clear) | 1138 | unsigned int set, unsigned int clear) |
1139 | { | 1139 | { |
1140 | struct usb_serial_port *port = tty->driver_data; | 1140 | struct usb_serial_port *port = tty->driver_data; |
1141 | struct digi_port *priv = usb_get_serial_port_data(port); | 1141 | struct digi_port *priv = usb_get_serial_port_data(port); |