diff options
author | Jiri Slaby <jslaby@suse.cz> | 2012-10-18 16:26:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-22 19:50:12 -0400 |
commit | 8fcbaa2b7f5b70dba9ed1c7f91d0a270ce752e2c (patch) | |
tree | 9f85c118012c263aaab73ae1d76fb1df1072b171 /drivers/tty/pty.c | |
parent | cee4ad1ed90a0959fc29f9d30a2526e5e9522cfa (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 'drivers/tty/pty.c')
-rw-r--r-- | drivers/tty/pty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index a82b39939a9c..65f767154d12 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c | |||
@@ -547,7 +547,7 @@ static struct tty_struct *pts_unix98_lookup(struct tty_driver *driver, | |||
547 | struct tty_struct *tty; | 547 | struct tty_struct *tty; |
548 | 548 | ||
549 | mutex_lock(&devpts_mutex); | 549 | mutex_lock(&devpts_mutex); |
550 | tty = devpts_get_tty(pts_inode, idx); | 550 | tty = devpts_get_priv(pts_inode); |
551 | mutex_unlock(&devpts_mutex); | 551 | mutex_unlock(&devpts_mutex); |
552 | /* Master must be open before slave */ | 552 | /* Master must be open before slave */ |
553 | if (!tty) | 553 | if (!tty) |