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 /net | |
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 'net')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 | ||||
-rw-r--r-- | net/irda/ircomm/ircomm_tty_ioctl.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 7f67fa4f2f5e..8e78e7447726 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) | |||
1098 | return dev->modem_status; | 1098 | return dev->modem_status; |
1099 | } | 1099 | } |
1100 | 1100 | ||
1101 | static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsigned int set, unsigned int clear) | 1101 | static int rfcomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear) |
1102 | { | 1102 | { |
1103 | struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; | 1103 | struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; |
1104 | struct rfcomm_dlc *dlc = dev->dlc; | 1104 | 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 bb47caeba7e6..5e0e718c930a 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) | |||
214 | } | 214 | } |
215 | 215 | ||
216 | /* | 216 | /* |
217 | * Function ircomm_tty_tiocmset (tty, file, set, clear) | 217 | * Function ircomm_tty_tiocmset (tty, set, clear) |
218 | * | 218 | * |
219 | * | 219 | * |
220 | * | 220 | * |
221 | */ | 221 | */ |
222 | int ircomm_tty_tiocmset(struct tty_struct *tty, struct file *file, | 222 | int ircomm_tty_tiocmset(struct tty_struct *tty, |
223 | unsigned int set, unsigned int clear) | 223 | unsigned int set, unsigned int clear) |
224 | { | 224 | { |
225 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; | 225 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; |