aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/devpts_fs.h
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-10-18 16:26:27 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-22 19:50:12 -0400
commit8fcbaa2b7f5b70dba9ed1c7f91d0a270ce752e2c (patch)
tree9f85c118012c263aaab73ae1d76fb1df1072b171 /include/linux/devpts_fs.h
parentcee4ad1ed90a0959fc29f9d30a2526e5e9522cfa (diff)
TTY: devpts, don't care about TTY in devpts_get_tty
The goal is to stop setting and using tty->driver_data in devpts code. It should be used solely by the driver's code, pty in this case. First, here we remove TTY from devpts_get_tty and rename it to devpts_get_priv. Note we do not remove type safety, we just shift the [implicit] (void *) cast one layer up. index was unused in devpts_get_tty, so remove that from the prototype too. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Acked-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/devpts_fs.h')
-rw-r--r--include/linux/devpts_fs.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/devpts_fs.h b/include/linux/devpts_fs.h
index 5ce0e5fd712e..de635a5505ea 100644
--- a/include/linux/devpts_fs.h
+++ b/include/linux/devpts_fs.h
@@ -21,8 +21,8 @@ int devpts_new_index(struct inode *ptmx_inode);
21void devpts_kill_index(struct inode *ptmx_inode, int idx); 21void devpts_kill_index(struct inode *ptmx_inode, int idx);
22/* mknod in devpts */ 22/* mknod in devpts */
23int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty); 23int devpts_pty_new(struct inode *ptmx_inode, struct tty_struct *tty);
24/* get tty structure */ 24/* get private structure */
25struct tty_struct *devpts_get_tty(struct inode *pts_inode, int number); 25void *devpts_get_priv(struct inode *pts_inode);
26/* unlink */ 26/* unlink */
27void devpts_pty_kill(struct tty_struct *tty); 27void devpts_pty_kill(struct tty_struct *tty);
28 28
@@ -36,8 +36,7 @@ static inline int devpts_pty_new(struct inode *ptmx_inode,
36{ 36{
37 return -EINVAL; 37 return -EINVAL;
38} 38}
39static inline struct tty_struct *devpts_get_tty(struct inode *pts_inode, 39static inline void *devpts_get_priv(struct inode *pts_inode)
40 int number)
41{ 40{
42 return NULL; 41 return NULL;
43} 42}