UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

TTY: tty3270, add tty install 

This has two outcomes:
* we give the TTY layer a tty_port
* we do not find the info structure every time open is called on that
  tty

In this case ->install is the only thing we want to do. We do not need
->open at all. See the tty->count > 1 check.

And since we take a reference in ->install, we need also ->cleanup to
drop the reference to a view.

Final note, see that we leave raw3270_find_view in place. It is
because views are removed even from module_exit.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux390@de.ibm.com
Cc: linux-s390@vger.kernel.org
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-08-07 21:48:03 +02:00 committed by Greg Kroah-Hartman
parent 9c650ffc27
commit 20cda6f25f
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/s390/char/tty3270.c
View File

@ -842,17 +842,14 @@ static struct raw3270_fn tty3270_fn = {
}; };
/* /*
* This routine is called whenever a 3270 tty is opened. * This routine is called whenever a 3270 tty is opened first time.
*/ */
static int static int tty3270_install(struct tty_driver *driver, struct tty_struct *tty)
tty3270_open(struct tty_struct *tty, struct file * filp)
{ {
struct raw3270_view *view; struct raw3270_view *view;
struct tty3270 *tp; struct tty3270 *tp;
int i, rc; int i, rc;
if (tty->count > 1)
return 0;
/* Check if the tty3270 is already there. */ /* Check if the tty3270 is already there. */
view = raw3270_find_view(&tty3270_fn, view = raw3270_find_view(&tty3270_fn,
tty->index + RAW3270_FIRSTMINOR); tty->index + RAW3270_FIRSTMINOR);
@ -865,7 +862,7 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
/* why to reassign? */ /* why to reassign? */
tty_port_tty_set(&tp->port, tty); tty_port_tty_set(&tp->port, tty);
tp->inattr = TF_INPUT; tp->inattr = TF_INPUT;
return 0; return tty_port_install(&tp->port, driver, tty);
} }
if (tty3270_max_index < tty->index + 1) if (tty3270_max_index < tty->index + 1)
tty3270_max_index = tty->index + 1; tty3270_max_index = tty->index + 1;
@ -895,7 +892,6 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
tty_port_tty_set(&tp->port, tty); tty_port_tty_set(&tp->port, tty);
tty->low_latency = 0; tty->low_latency = 0;
tty->driver_data = tp;
tty->winsize.ws_row = tp->view.rows - 2; tty->winsize.ws_row = tp->view.rows - 2;
tty->winsize.ws_col = tp->view.cols; tty->winsize.ws_col = tp->view.cols;
@ -915,6 +911,15 @@ tty3270_open(struct tty_struct *tty, struct file * filp)
kbd_ascebc(tp->kbd, tp->view.ascebc); kbd_ascebc(tp->kbd, tp->view.ascebc);
raw3270_activate_view(&tp->view); raw3270_activate_view(&tp->view);
rc = tty_port_install(&tp->port, driver, tty);
if (rc) {
raw3270_put_view(&tp->view);
return rc;
}
tty->driver_data = tp;
return 0; return 0;
} }
@ -932,10 +937,17 @@ tty3270_close(struct tty_struct *tty, struct file * filp)
if (tp) { if (tp) {
tty->driver_data = NULL; tty->driver_data = NULL;
tty_port_tty_set(&tp->port, NULL); tty_port_tty_set(&tp->port, NULL);
raw3270_put_view(&tp->view);
} }
} }
static void tty3270_cleanup(struct tty_struct *tty)
{
struct tty3270 *tp = tty->driver_data;
if (tp)
raw3270_put_view(&tp->view);
}
/* /*
* We always have room. * We always have room.
*/ */
@ -1737,7 +1749,8 @@ static long tty3270_compat_ioctl(struct tty_struct *tty,
#endif #endif
static const struct tty_operations tty3270_ops = { static const struct tty_operations tty3270_ops = {
.open = tty3270_open, .install = tty3270_install,
.cleanup = tty3270_cleanup,
.close = tty3270_close, .close = tty3270_close,
.write = tty3270_write, .write = tty3270_write,
.put_char = tty3270_put_char, .put_char = tty3270_put_char,