summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2016-06-23 07:34:37 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-25 12:04:48 -0400
commitabd530de2a55c1a74271e27d6e8c71c74c25e222 (patch)
tree41ca79de22b84fa6d8b4d2c1a31a53e98785c565
parentf8b0c2e688f086d22157afc734755ed370e288dc (diff)
tty: vt, remove unused vc_deccolm
vc_deccolm is only set and never read, remove the member from vc_data. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/vt/vt.c1
-rw-r--r--include/linux/console_struct.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 26de5c0fc056..213ce24060b5 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -1482,7 +1482,6 @@ static void set_mode(struct vc_data *vc, int on_off)
1482 clr_kbd(vc, decckm); 1482 clr_kbd(vc, decckm);
1483 break; 1483 break;
1484 case 3: /* 80/132 mode switch unimplemented */ 1484 case 3: /* 80/132 mode switch unimplemented */
1485 vc->vc_deccolm = on_off;
1486#if 0 1485#if 0
1487 vc_resize(deccolm ? 132 : 80, vc->vc_rows); 1486 vc_resize(deccolm ? 132 : 80, vc->vc_rows);
1488 /* this alone does not suffice; some user mode 1487 /* this alone does not suffice; some user mode
diff --git a/include/linux/console_struct.h b/include/linux/console_struct.h
index a12d3f2899a8..6fd3c908a340 100644
--- a/include/linux/console_struct.h
+++ b/include/linux/console_struct.h
@@ -106,7 +106,6 @@ struct vc_data {
106 unsigned int vc_decawm : 1; /* Autowrap Mode */ 106 unsigned int vc_decawm : 1; /* Autowrap Mode */
107 unsigned int vc_deccm : 1; /* Cursor Visible */ 107 unsigned int vc_deccm : 1; /* Cursor Visible */
108 unsigned int vc_decim : 1; /* Insert Mode */ 108 unsigned int vc_decim : 1; /* Insert Mode */
109 unsigned int vc_deccolm : 1; /* 80/132 Column Mode */
110 /* attribute flags */ 109 /* attribute flags */
111 unsigned int vc_intensity : 2; /* 0=half-bright, 1=normal, 2=bold */ 110 unsigned int vc_intensity : 2; /* 0=half-bright, 1=normal, 2=bold */
112 unsigned int vc_italic:1; 111 unsigned int vc_italic:1;