diff options
| author | Jiri Slaby | 2016-06-23 13:34:23 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-06-25 18:04:48 +0200 |
| commit | 1b0ec88ac1cb0413a717bc3cefea72d6f2533672 (patch) | |
| tree | 96d1b2f774f5575b7de57b6a8efebfa63d9f27a1 /drivers/tty | |
| parent | tty: 8250, remove shadow and unused variables (diff) | |
| download | kernel-qcow2-linux-1b0ec88ac1cb0413a717bc3cefea72d6f2533672.tar.gz kernel-qcow2-linux-1b0ec88ac1cb0413a717bc3cefea72d6f2533672.tar.xz kernel-qcow2-linux-1b0ec88ac1cb0413a717bc3cefea72d6f2533672.zip | |
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')
| -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) static void fn_scroll_back(struct vc_data *vc) { - scrollback(vc, 0); + scrollback(vc); } 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) gotoxy(vc, new_x, vc->vc_decom ? (vc->vc_top + new_y) : new_y); } -void scrollback(struct vc_data *vc, int lines) +void scrollback(struct vc_data *vc) { - if (!lines) - lines = vc->vc_rows / 2; - scrolldelta(-lines); + scrolldelta(-(vc->vc_rows / 2)); } void scrollfront(struct vc_data *vc, int lines) |