Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

tty: vt: remove consw::con_getxy()

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

Signed-off-by: "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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Jiri Slaby (SUSE) and committed by
Greg Kroah-Hartman
f441aa3b af757ca6

+5 -17
+5 -15
drivers/tty/vt/vt.c
··· 593 593 static void do_update_region(struct vc_data *vc, unsigned long start, int count) 594 594 { 595 595 unsigned int xx, yy, offset; 596 - u16 *p; 596 + u16 *p = (u16 *)start; 597 597 598 - p = (u16 *) start; 599 - if (!vc->vc_sw->con_getxy) { 600 - offset = (start - vc->vc_origin) / 2; 601 - xx = offset % vc->vc_cols; 602 - yy = offset / vc->vc_cols; 603 - } else { 604 - int nxx, nyy; 605 - start = vc->vc_sw->con_getxy(vc, start, &nxx, &nyy); 606 - xx = nxx; yy = nyy; 607 - } 598 + offset = (start - vc->vc_origin) / 2; 599 + xx = offset % vc->vc_cols; 600 + yy = offset / vc->vc_cols; 601 + 608 602 for(;;) { 609 603 u16 attrib = scr_readw(p) & 0xff00; 610 604 int startx = xx; ··· 621 627 break; 622 628 xx = 0; 623 629 yy++; 624 - if (vc->vc_sw->con_getxy) { 625 - p = (u16 *)start; 626 - start = vc->vc_sw->con_getxy(vc, start, NULL, NULL); 627 - } 628 630 } 629 631 } 630 632
-2
include/linux/console.h
··· 96 96 enum vc_intensity intensity, 97 97 bool blink, bool underline, bool reverse, bool italic); 98 98 void (*con_invert_region)(struct vc_data *vc, u16 *p, int count); 99 - unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position, 100 - int *px, int *py); 101 99 /* 102 100 * Flush the video console driver's scrollback buffer 103 101 */