diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2014-07-10 23:01:22 +0400 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-10-21 10:45:37 +0300 |
| commit | 0dc346827709deb0bce5056ffbcb9d2b8521ab68 (patch) | |
| tree | 2dd45f827a987aab75d199500cd716ce7d8eb784 /include | |
| parent | e0431b808e0c48b9ebe9dae956c4ba2497413d33 (diff) | |
| download | linux-0dc346827709deb0bce5056ffbcb9d2b8521ab68.tar.xz | |
drivers: tty: Merge alloc_tty_struct and initialize_tty_struct
commit 2c964a2f4191f2229566895f1a0e85f8339f5dd1 upstream.
The two functions alloc_tty_struct and initialize_tty_struct are
always called together. Merge them into alloc_tty_struct, updating its
prototype and the only two callers of these functions.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tty.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 1d02392fa3bd..453dcc810da0 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -477,13 +477,11 @@ extern int tty_mode_ioctl(struct tty_struct *tty, struct file *file, unsigned int cmd, unsigned long arg); extern int tty_perform_flush(struct tty_struct *tty, unsigned long arg); extern void tty_default_fops(struct file_operations *fops); -extern struct tty_struct *alloc_tty_struct(void); +extern struct tty_struct *alloc_tty_struct(struct tty_driver *driver, int idx); extern int tty_alloc_file(struct file *file); extern void tty_add_file(struct tty_struct *tty, struct file *file); extern void tty_free_file(struct file *file); extern void free_tty_struct(struct tty_struct *tty); -extern void initialize_tty_struct(struct tty_struct *tty, - struct tty_driver *driver, int idx); extern void deinitialize_tty_struct(struct tty_struct *tty); extern struct tty_struct *tty_init_dev(struct tty_driver *driver, int idx); extern int tty_release(struct inode *inode, struct file *filp); |