| From 06a0df4d1b8b13b551668e47b11fd7629033b7df Mon Sep 17 00:00:00 2001 |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| Date: Tue, 8 Sep 2020 10:56:27 -0700 |
| Subject: fbcon: remove now unusued 'softback_lines' cursor() argument |
| |
| From: Linus Torvalds <torvalds@linux-foundation.org> |
| |
| commit 06a0df4d1b8b13b551668e47b11fd7629033b7df upstream. |
| |
| Since the softscroll code got removed, this argument is always zero and |
| makes no sense any more. |
| |
| Tested-by: Yuan Ming <yuanmingbuaa@gmail.com> |
| Tested-by: Willy Tarreau <w@1wt.eu> |
| Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/video/fbdev/core/bitblit.c | 11 +---------- |
| drivers/video/fbdev/core/fbcon.c | 4 ++-- |
| drivers/video/fbdev/core/fbcon.h | 2 +- |
| drivers/video/fbdev/core/fbcon_ccw.c | 11 +---------- |
| drivers/video/fbdev/core/fbcon_cw.c | 11 +---------- |
| drivers/video/fbdev/core/fbcon_ud.c | 11 +---------- |
| drivers/video/fbdev/core/tileblit.c | 2 +- |
| 7 files changed, 8 insertions(+), 44 deletions(-) |
| |
| --- a/drivers/video/fbdev/core/bitblit.c |
| +++ b/drivers/video/fbdev/core/bitblit.c |
| @@ -234,7 +234,7 @@ static void bit_clear_margins(struct vc_ |
| } |
| |
| static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg) |
| + int fg, int bg) |
| { |
| struct fb_cursor cursor; |
| struct fbcon_ops *ops = info->fbcon_par; |
| @@ -247,15 +247,6 @@ static void bit_cursor(struct vc_data *v |
| |
| cursor.set = 0; |
| |
| - if (softback_lines) { |
| - if (y + softback_lines >= vc->vc_rows) { |
| - mode = CM_ERASE; |
| - ops->cursor_flash = 0; |
| - return; |
| - } else |
| - y += softback_lines; |
| - } |
| - |
| c = scr_readw((u16 *) vc->vc_pos); |
| attribute = get_attribute(info, c); |
| src = vc->vc_font.data + ((c & charmask) * (w * vc->vc_font.height)); |
| --- a/drivers/video/fbdev/core/fbcon.c |
| +++ b/drivers/video/fbdev/core/fbcon.c |
| @@ -394,7 +394,7 @@ static void fb_flashcursor(struct work_s |
| c = scr_readw((u16 *) vc->vc_pos); |
| mode = (!ops->cursor_flash || ops->cursor_state.enable) ? |
| CM_ERASE : CM_DRAW; |
| - ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1), |
| + ops->cursor(vc, info, mode, get_color(vc, info, c, 1), |
| get_color(vc, info, c, 0)); |
| console_unlock(); |
| } |
| @@ -1339,7 +1339,7 @@ static void fbcon_cursor(struct vc_data |
| |
| ops->cursor_flash = (mode == CM_ERASE) ? 0 : 1; |
| |
| - ops->cursor(vc, info, mode, 0, get_color(vc, info, c, 1), |
| + ops->cursor(vc, info, mode, get_color(vc, info, c, 1), |
| get_color(vc, info, c, 0)); |
| } |
| |
| --- a/drivers/video/fbdev/core/fbcon.h |
| +++ b/drivers/video/fbdev/core/fbcon.h |
| @@ -62,7 +62,7 @@ struct fbcon_ops { |
| void (*clear_margins)(struct vc_data *vc, struct fb_info *info, |
| int color, int bottom_only); |
| void (*cursor)(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg); |
| + int fg, int bg); |
| int (*update_start)(struct fb_info *info); |
| int (*rotate_font)(struct fb_info *info, struct vc_data *vc); |
| struct fb_var_screeninfo var; /* copy of the current fb_var_screeninfo */ |
| --- a/drivers/video/fbdev/core/fbcon_ccw.c |
| +++ b/drivers/video/fbdev/core/fbcon_ccw.c |
| @@ -219,7 +219,7 @@ static void ccw_clear_margins(struct vc_ |
| } |
| |
| static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg) |
| + int fg, int bg) |
| { |
| struct fb_cursor cursor; |
| struct fbcon_ops *ops = info->fbcon_par; |
| @@ -236,15 +236,6 @@ static void ccw_cursor(struct vc_data *v |
| |
| cursor.set = 0; |
| |
| - if (softback_lines) { |
| - if (y + softback_lines >= vc->vc_rows) { |
| - mode = CM_ERASE; |
| - ops->cursor_flash = 0; |
| - return; |
| - } else |
| - y += softback_lines; |
| - } |
| - |
| c = scr_readw((u16 *) vc->vc_pos); |
| attribute = get_attribute(info, c); |
| src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width)); |
| --- a/drivers/video/fbdev/core/fbcon_cw.c |
| +++ b/drivers/video/fbdev/core/fbcon_cw.c |
| @@ -202,7 +202,7 @@ static void cw_clear_margins(struct vc_d |
| } |
| |
| static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg) |
| + int fg, int bg) |
| { |
| struct fb_cursor cursor; |
| struct fbcon_ops *ops = info->fbcon_par; |
| @@ -219,15 +219,6 @@ static void cw_cursor(struct vc_data *vc |
| |
| cursor.set = 0; |
| |
| - if (softback_lines) { |
| - if (y + softback_lines >= vc->vc_rows) { |
| - mode = CM_ERASE; |
| - ops->cursor_flash = 0; |
| - return; |
| - } else |
| - y += softback_lines; |
| - } |
| - |
| c = scr_readw((u16 *) vc->vc_pos); |
| attribute = get_attribute(info, c); |
| src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.width)); |
| --- a/drivers/video/fbdev/core/fbcon_ud.c |
| +++ b/drivers/video/fbdev/core/fbcon_ud.c |
| @@ -249,7 +249,7 @@ static void ud_clear_margins(struct vc_d |
| } |
| |
| static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg) |
| + int fg, int bg) |
| { |
| struct fb_cursor cursor; |
| struct fbcon_ops *ops = info->fbcon_par; |
| @@ -267,15 +267,6 @@ static void ud_cursor(struct vc_data *vc |
| |
| cursor.set = 0; |
| |
| - if (softback_lines) { |
| - if (y + softback_lines >= vc->vc_rows) { |
| - mode = CM_ERASE; |
| - ops->cursor_flash = 0; |
| - return; |
| - } else |
| - y += softback_lines; |
| - } |
| - |
| c = scr_readw((u16 *) vc->vc_pos); |
| attribute = get_attribute(info, c); |
| src = ops->fontbuffer + ((c & charmask) * (w * vc->vc_font.height)); |
| --- a/drivers/video/fbdev/core/tileblit.c |
| +++ b/drivers/video/fbdev/core/tileblit.c |
| @@ -80,7 +80,7 @@ static void tile_clear_margins(struct vc |
| } |
| |
| static void tile_cursor(struct vc_data *vc, struct fb_info *info, int mode, |
| - int softback_lines, int fg, int bg) |
| + int fg, int bg) |
| { |
| struct fb_tilecursor cursor; |
| int use_sw = (vc->vc_cursor_type & 0x10); |