3 files changed, 15 insertions, 30 deletions

diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile
index 14a51c9960df..17ae94cb29f8 100644
--- a/drivers/tty/vt/Makefile
+++ b/drivers/tty/vt/Makefile
@@ -27,8 +27,6 @@ $(obj)/defkeymap.o:  $(obj)/defkeymap.c
 ifdef GENERATE_KEYMAP
 
 $(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map
-        loadkeys --mktable $< > $@.tmp
-        sed -e 's/^static *//' $@.tmp > $@
-        rm $@.tmp
+        loadkeys --mktable $< > $@
 
 endif
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 681765baef69..a9af1b9ae160 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -307,26 +307,17 @@ int kbd_rate(struct kbd_repeat *rep)
  */
 static void put_queue(struct vc_data *vc, int ch)
 {
-        struct tty_struct *tty = vc->port.tty;
-
-        if (tty) {
-                tty_insert_flip_char(tty, ch, 0);
-                tty_schedule_flip(tty);
-        }
+        tty_insert_flip_char(&vc->port, ch, 0);
+        tty_schedule_flip(&vc->port);
 }
 
 static void puts_queue(struct vc_data *vc, char *cp)
 {
-        struct tty_struct *tty = vc->port.tty;
-
-        if (!tty)
-                return;
-
         while (*cp) {
-                tty_insert_flip_char(tty, *cp, 0);
+                tty_insert_flip_char(&vc->port, *cp, 0);
                 cp++;
         }
-        tty_schedule_flip(tty);
+        tty_schedule_flip(&vc->port);
 }
 
 static void applkey(struct vc_data *vc, int key, char mode)
@@ -582,12 +573,8 @@ static void fn_inc_console(struct vc_data *vc)
 
 static void fn_send_intr(struct vc_data *vc)
 {
-        struct tty_struct *tty = vc->port.tty;
-
-        if (!tty)
-                return;
-        tty_insert_flip_char(tty, 0, TTY_BREAK);
-        tty_schedule_flip(tty);
+        tty_insert_flip_char(&vc->port, 0, TTY_BREAK);
+        tty_schedule_flip(&vc->port);
 }
 
 static void fn_scroll_forw(struct vc_data *vc)
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 8fd89687d068..1a2728034599 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1333,13 +1333,13 @@ static void csi_m(struct vc_data *vc)
         update_attr(vc);
 }
 
-static void respond_string(const char *p, struct tty_struct *tty)
+static void respond_string(const char *p, struct tty_port *port)
 {
         while (*p) {
-                tty_insert_flip_char(tty, *p, 0);
+                tty_insert_flip_char(port, *p, 0);
                 p++;
         }
-        tty_schedule_flip(tty);
+        tty_schedule_flip(port);
 }
 
 static void cursor_report(struct vc_data *vc, struct tty_struct *tty)
@@ -1347,17 +1347,17 @@ static void cursor_report(struct vc_data *vc, struct tty_struct *tty)
         char buf[40];
 
         sprintf(buf, "\033[%d;%dR", vc->vc_y + (vc->vc_decom ? vc->vc_top + 1 : 1), vc->vc_x + 1);
-        respond_string(buf, tty);
+        respond_string(buf, tty->port);
 }
 
 static inline void status_report(struct tty_struct *tty)
 {
-        respond_string("\033[0n", tty); /* Terminal ok */
+        respond_string("\033[0n", tty->port);   /* Terminal ok */
 }
 
-static inline void respond_ID(struct tty_struct * tty)
+static inline void respond_ID(struct tty_struct *tty)
 {
-        respond_string(VT102ID, tty);
+        respond_string(VT102ID, tty->port);
 }
 
 void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry)
@@ -1366,7 +1366,7 @@ void mouse_report(struct tty_struct *tty, int butt, int mrx, int mry)
 
         sprintf(buf, "\033[M%c%c%c", (char)(' ' + butt), (char)('!' + mrx),
                 (char)('!' + mry));
-        respond_string(buf, tty);
+        respond_string(buf, tty->port);
 }
 
 /* invoked via ioctl(TIOCLINUX) and through set_selection */