From 6eb8a98333c97ea1ac8061458e7e96cbfa4cd8c3 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 4 Jun 2012 13:35:28 +0200 Subject: [PATCH] --- yaml --- r: 325584 b: refs/heads/master c: 7171604ae7b3bbc738b6a4b7cd0ee73eb0d551d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/pty.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5fe921a37d1c..47a0c6209c63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8856a7d6b7c39eece126f23c6cdbd11ff2218d6f +refs/heads/master: 7171604ae7b3bbc738b6a4b7cd0ee73eb0d551d9 diff --git a/trunk/drivers/tty/pty.c b/trunk/drivers/tty/pty.c index 5505ffc91da4..4bcaf896fac4 100644 --- a/trunk/drivers/tty/pty.c +++ b/trunk/drivers/tty/pty.c @@ -557,18 +557,14 @@ static int pty_unix98_install(struct tty_driver *driver, struct tty_struct *tty) return -ENOMEM; } -static void ptm_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) -{ -} - -static void pts_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) +static void pty_unix98_remove(struct tty_driver *driver, struct tty_struct *tty) { } static const struct tty_operations ptm_unix98_ops = { .lookup = ptm_unix98_lookup, .install = pty_unix98_install, - .remove = ptm_unix98_remove, + .remove = pty_unix98_remove, .open = pty_open, .close = pty_close, .write = pty_write, @@ -585,7 +581,7 @@ static const struct tty_operations ptm_unix98_ops = { static const struct tty_operations pty_unix98_ops = { .lookup = pts_unix98_lookup, .install = pty_unix98_install, - .remove = pts_unix98_remove, + .remove = pty_unix98_remove, .open = pty_open, .close = pty_close, .write = pty_write,