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

tty: vt: remove consw::con_getxy() 



After the previous patch, nobody sets that hook. So drop it completely.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-44-jirislaby@kernel.org


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

drivers/tty/vt/vt.c

+5 −15
Original line number Diff line number Diff line
@@ -593,18 +593,12 @@ static void con_scroll(struct vc_data *vc, unsigned int top, 
static void do_update_region(struct vc_data *vc, unsigned long start, int count)

{

	unsigned int xx, yy, offset;

	u16 *p;

	u16 *p = (u16 *)start;



	p = (u16 *) start;

	if (!vc->vc_sw->con_getxy) {

	offset = (start - vc->vc_origin) / 2;

	xx = offset % vc->vc_cols;

	yy = offset / vc->vc_cols;

	} else {

		int nxx, nyy;

		start = vc->vc_sw->con_getxy(vc, start, &nxx, &nyy);

		xx = nxx; yy = nyy;

	}



	for(;;) {

		u16 attrib = scr_readw(p) & 0xff00;

		int startx = xx;
@@ -627,10 +621,6 @@ static void do_update_region(struct vc_data *vc, unsigned long start, int count) 
			break;

		xx = 0;

		yy++;

		if (vc->vc_sw->con_getxy) {

			p = (u16 *)start;

			start = vc->vc_sw->con_getxy(vc, start, NULL, NULL);

		}

	}

}

include/linux/console.h

+0 −2
Original line number Diff line number Diff line
@@ -96,8 +96,6 @@ struct consw { 
			enum vc_intensity intensity,

			bool blink, bool underline, bool reverse, bool italic);

	void	(*con_invert_region)(struct vc_data *vc, u16 *p, int count);

	unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position,

			int *px, int *py);

	/*

	 * Flush the video console driver's scrollback buffer

	 */