aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 11:26:50 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:52:43 -0500
commit20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch)
tree64e9c4ff845844298f9056357d9f4914802207f8 /drivers/net/usb
parent60b33c133ca0b7c0b6072c87234b63fee6e80558 (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/net/usb')
-rw-r--r--drivers/net/usb/hso.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 7c68c456c035..956e1d6e72a5 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -324,7 +324,7 @@ struct hso_device {
324/* Prototypes */ 324/* Prototypes */
325/*****************************************************************************/ 325/*****************************************************************************/
326/* Serial driver functions */ 326/* Serial driver functions */
327static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file, 327static int hso_serial_tiocmset(struct tty_struct *tty,
328 unsigned int set, unsigned int clear); 328 unsigned int set, unsigned int clear);
329static void ctrl_callback(struct urb *urb); 329static void ctrl_callback(struct urb *urb);
330static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial); 330static int put_rxbuf_data(struct urb *urb, struct hso_serial *serial);
@@ -1335,7 +1335,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
1335 1335
1336 /* done */ 1336 /* done */
1337 if (result) 1337 if (result)
1338 hso_serial_tiocmset(tty, NULL, TIOCM_RTS | TIOCM_DTR, 0); 1338 hso_serial_tiocmset(tty, TIOCM_RTS | TIOCM_DTR, 0);
1339err_out: 1339err_out:
1340 mutex_unlock(&serial->parent->mutex); 1340 mutex_unlock(&serial->parent->mutex);
1341 return result; 1341 return result;
@@ -1687,7 +1687,7 @@ static int hso_serial_tiocmget(struct tty_struct *tty)
1687 return retval; 1687 return retval;
1688} 1688}
1689 1689
1690static int hso_serial_tiocmset(struct tty_struct *tty, struct file *file, 1690static int hso_serial_tiocmset(struct tty_struct *tty,
1691 unsigned int set, unsigned int clear) 1691 unsigned int set, unsigned int clear)
1692{ 1692{
1693 int val = 0; 1693 int val = 0;