diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bluetooth/rfcomm/tty.c | 6 | ||||
-rw-r--r-- | net/irda/ircomm/ircomm_tty_ioctl.c | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 2575c2db6404..b1805ff95415 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c | |||
@@ -830,7 +830,7 @@ static int rfcomm_tty_write_room(struct tty_struct *tty) | |||
830 | return room; | 830 | return room; |
831 | } | 831 | } |
832 | 832 | ||
833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) | 833 | static int rfcomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg) |
834 | { | 834 | { |
835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); | 835 | BT_DBG("tty %p cmd 0x%02x", tty, cmd); |
836 | 836 | ||
@@ -1089,7 +1089,7 @@ static void rfcomm_tty_hangup(struct tty_struct *tty) | |||
1089 | } | 1089 | } |
1090 | } | 1090 | } |
1091 | 1091 | ||
1092 | static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp) | 1092 | static int rfcomm_tty_tiocmget(struct tty_struct *tty) |
1093 | { | 1093 | { |
1094 | struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; | 1094 | struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; |
1095 | 1095 | ||
@@ -1098,7 +1098,7 @@ static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp) | |||
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 24cb3aa2bbfb..77c5e6499f8f 100644 --- a/net/irda/ircomm/ircomm_tty_ioctl.c +++ b/net/irda/ircomm/ircomm_tty_ioctl.c | |||
@@ -189,12 +189,12 @@ void ircomm_tty_set_termios(struct tty_struct *tty, | |||
189 | } | 189 | } |
190 | 190 | ||
191 | /* | 191 | /* |
192 | * Function ircomm_tty_tiocmget (tty, file) | 192 | * Function ircomm_tty_tiocmget (tty) |
193 | * | 193 | * |
194 | * | 194 | * |
195 | * | 195 | * |
196 | */ | 196 | */ |
197 | int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file) | 197 | int ircomm_tty_tiocmget(struct tty_struct *tty) |
198 | { | 198 | { |
199 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; | 199 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; |
200 | unsigned int result; | 200 | unsigned int result; |
@@ -214,12 +214,12 @@ int ircomm_tty_tiocmget(struct tty_struct *tty, struct file *file) | |||
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; |
@@ -365,12 +365,12 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self, | |||
365 | } | 365 | } |
366 | 366 | ||
367 | /* | 367 | /* |
368 | * Function ircomm_tty_ioctl (tty, file, cmd, arg) | 368 | * Function ircomm_tty_ioctl (tty, cmd, arg) |
369 | * | 369 | * |
370 | * | 370 | * |
371 | * | 371 | * |
372 | */ | 372 | */ |
373 | int ircomm_tty_ioctl(struct tty_struct *tty, struct file *file, | 373 | int ircomm_tty_ioctl(struct tty_struct *tty, |
374 | unsigned int cmd, unsigned long arg) | 374 | unsigned int cmd, unsigned long arg) |
375 | { | 375 | { |
376 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; | 376 | struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data; |