diff options
author | Jiri Slaby <jslaby@suse.cz> | 2016-06-23 07:34:23 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-25 12:04:48 -0400 |
commit | 1b0ec88ac1cb0413a717bc3cefea72d6f2533672 (patch) | |
tree | 96d1b2f774f5575b7de57b6a8efebfa63d9f27a1 /drivers/tty/vt | |
parent | 17b2720b114cc95b2b7c8c0f5cfa20e44e1f5912 (diff) |
vt: remove lines parameter from scrollback
It is always called with 0, so remove the parameter and pass the
default down to scrolldelta without checking.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r-- | drivers/tty/vt/keyboard.c | 2 | ||||
-rw-r--r-- | drivers/tty/vt/vt.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index f973bfce5d08..cd08c103eb47 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c | |||
@@ -579,7 +579,7 @@ static void fn_scroll_forw(struct vc_data *vc) | |||
579 | 579 | ||
580 | static void fn_scroll_back(struct vc_data *vc) | 580 | static void fn_scroll_back(struct vc_data *vc) |
581 | { | 581 | { |
582 | scrollback(vc, 0); | 582 | scrollback(vc); |
583 | } | 583 | } |
584 | 584 | ||
585 | static void fn_show_mem(struct vc_data *vc) | 585 | static void fn_show_mem(struct vc_data *vc) |
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index dc125322f48f..abc79ae19079 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c | |||
@@ -1102,11 +1102,9 @@ static void gotoxay(struct vc_data *vc, int new_x, int new_y) | |||
1102 | gotoxy(vc, new_x, vc->vc_decom ? (vc->vc_top + new_y) : new_y); | 1102 | gotoxy(vc, new_x, vc->vc_decom ? (vc->vc_top + new_y) : new_y); |
1103 | } | 1103 | } |
1104 | 1104 | ||
1105 | void scrollback(struct vc_data *vc, int lines) | 1105 | void scrollback(struct vc_data *vc) |
1106 | { | 1106 | { |
1107 | if (!lines) | 1107 | scrolldelta(-(vc->vc_rows / 2)); |
1108 | lines = vc->vc_rows / 2; | ||
1109 | scrolldelta(-lines); | ||
1110 | } | 1108 | } |
1111 | 1109 | ||
1112 | void scrollfront(struct vc_data *vc, int lines) | 1110 | void scrollfront(struct vc_data *vc, int lines) |