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 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/tty_driver.h | 2 | ||||
| -rw-r--r-- | include/linux/usb/serial.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 9539d74171d..5dabaa2e6da 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h | |||
| @@ -272,7 +272,7 @@ struct tty_operations { | |||
| 272 | void (*wait_until_sent)(struct tty_struct *tty, int timeout); | 272 | void (*wait_until_sent)(struct tty_struct *tty, int timeout); |
| 273 | void (*send_xchar)(struct tty_struct *tty, char ch); | 273 | void (*send_xchar)(struct tty_struct *tty, char ch); |
| 274 | int (*tiocmget)(struct tty_struct *tty); | 274 | int (*tiocmget)(struct tty_struct *tty); |
| 275 | int (*tiocmset)(struct tty_struct *tty, struct file *file, | 275 | int (*tiocmset)(struct tty_struct *tty, |
| 276 | unsigned int set, unsigned int clear); | 276 | unsigned int set, unsigned int clear); |
| 277 | int (*resize)(struct tty_struct *tty, struct winsize *ws); | 277 | int (*resize)(struct tty_struct *tty, struct winsize *ws); |
| 278 | int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew); | 278 | int (*set_termiox)(struct tty_struct *tty, struct termiox *tnew); |
diff --git a/include/linux/usb/serial.h b/include/linux/usb/serial.h index 30b945397d1..c1aa1b243ba 100644 --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h | |||
| @@ -269,7 +269,7 @@ struct usb_serial_driver { | |||
| 269 | void (*throttle)(struct tty_struct *tty); | 269 | void (*throttle)(struct tty_struct *tty); |
| 270 | void (*unthrottle)(struct tty_struct *tty); | 270 | void (*unthrottle)(struct tty_struct *tty); |
| 271 | int (*tiocmget)(struct tty_struct *tty); | 271 | int (*tiocmget)(struct tty_struct *tty); |
| 272 | int (*tiocmset)(struct tty_struct *tty, struct file *file, | 272 | int (*tiocmset)(struct tty_struct *tty, |
| 273 | unsigned int set, unsigned int clear); | 273 | unsigned int set, unsigned int clear); |
| 274 | int (*get_icount)(struct tty_struct *tty, | 274 | int (*get_icount)(struct tty_struct *tty, |
| 275 | struct serial_icounter_struct *icount); | 275 | struct serial_icounter_struct *icount); |
