Commit af757ca6 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

fbcon: remove fbcon_getxy() 



Again, fbcon_getxy() is the same as the default implementation since the
softscroll removal in commit 50145474 (fbcon: remove soft scrollback
code). Drop that.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-43-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd1ca819

drivers/video/fbdev/core/fbcon.c

+0 −25
Original line number Diff line number Diff line
@@ -2593,30 +2593,6 @@ static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table) 
	fb_set_cmap(&palette_cmap, info);

}



static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,

				 int *px, int *py)

{

	unsigned long ret;

	int x, y;



	if (pos >= vc->vc_origin && pos < vc->vc_scr_end) {

		unsigned long offset = (pos - vc->vc_origin) / 2;



		x = offset % vc->vc_cols;

		y = offset / vc->vc_cols;

		ret = pos + (vc->vc_cols - x) * 2;

	} else {

		/* Should not happen */

		x = y = 0;

		ret = vc->vc_origin;

	}

	if (px)

		*px = x;

	if (py)

		*py = y;

	return ret;

}



/* As we might be inside of softback, we may work with non-contiguous buffer,

   that's why we have to use a separate routine. */

static void fbcon_invert_region(struct vc_data *vc, u16 * p, int cnt)
@@ -3157,7 +3133,6 @@ static const struct consw fb_con = { 
	.con_font_default	= fbcon_set_def_font,

	.con_set_palette 	= fbcon_set_palette,

	.con_invert_region 	= fbcon_invert_region,

	.con_getxy 		= fbcon_getxy,

	.con_resize             = fbcon_resize,

	.con_debug_enter	= fbcon_debug_enter,

	.con_debug_leave	= fbcon_debug_leave,