summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-02-14 16:26:50 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:52:43 -0800
commit20b9d17715017ae4dd4ec87fabc36d33b9de708e (patch)
tree64e9c4ff845844298f9056357d9f4914802207f8 /net
parent60b33c133ca0b7c0b6072c87234b63fee6e80558 (diff)
downloadop-kernel-dev-20b9d17715017ae4dd4ec87fabc36d33b9de708e.zip
op-kernel-dev-20b9d17715017ae4dd4ec87fabc36d33b9de708e.tar.gz
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 'net')
-rw-r--r--net/bluetooth/rfcomm/tty.c2
-rw-r--r--net/irda/ircomm/ircomm_tty_ioctl.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index 7f67fa4..8e78e74 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -1098,7 +1098,7 @@ static int rfcomm_tty_tiocmget(struct tty_struct *tty)
return dev->modem_status;
}
-static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsigned int set, unsigned int clear)
+static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear)
{
struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
struct rfcomm_dlc *dlc = dev->dlc;
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index bb47cae..5e0e718 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -214,12 +214,12 @@ int ircomm_tty_tiocmget(struct tty_struct *tty)
}
/*
- * Function ircomm_tty_tiocmset (tty, file, set, clear)
+ * Function ircomm_tty_tiocmset (tty, set, clear)
*
*
*
*/
-int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file,
+int ircomm_tty_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{
struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
OpenPOWER on IntegriCloud