tty: Move the vt_tty field from the vc_data into the standard tty_port

This takes all the tty references through the expected interface points so
we can refcount them.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 25be2102a60a..a7ca75212bfe 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -299,7 +299,7 @@ int kbd_rate(struct kbd_repeat *rep)
  */
 static void put_queue(struct vc_data *vc, int ch)
 {
-        struct tty_struct *tty = vc->vc_tty;
+        struct tty_struct *tty = vc->port.tty;
 
         if (tty) {
                 tty_insert_flip_char(tty, ch, 0);
@@ -309,7 +309,7 @@ static void put_queue(struct vc_data *vc, int ch)
 
 static void puts_queue(struct vc_data *vc, char *cp)
 {
-        struct tty_struct *tty = vc->vc_tty;
+        struct tty_struct *tty = vc->port.tty;
 
         if (!tty)
                 return;
@@ -485,7 +485,7 @@ static void fn_show_ptregs(struct vc_data *vc)
 
 static void fn_hold(struct vc_data *vc)
 {
-        struct tty_struct *tty = vc->vc_tty;
+        struct tty_struct *tty = vc->port.tty;
 
         if (rep || !tty)
                 return;
@@ -563,7 +563,7 @@ static void fn_inc_console(struct vc_data *vc)
 
 static void fn_send_intr(struct vc_data *vc)
 {
-        struct tty_struct *tty = vc->vc_tty;
+        struct tty_struct *tty = vc->port.tty;
 
         if (!tty)
                 return;
@@ -1162,7 +1162,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
         struct keyboard_notifier_param param = { .vc = vc, .value = keycode, .down = down };
         int rc;
 
-        tty = vc->vc_tty;
+        tty = vc->port.tty;
 
         if (tty && (!tty->driver_data)) {
                 /* No driver data? Strange. Okay we fix it then. */