Commit 7cf01c92 authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman

tty: vt: remove consw::con_screen_pos()

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-41-jirislaby@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d62808ba
...@@ -289,15 +289,9 @@ static inline bool con_should_update(const struct vc_data *vc) ...@@ -289,15 +289,9 @@ static inline bool con_should_update(const struct vc_data *vc)
static inline unsigned short *screenpos(const struct vc_data *vc, int offset, static inline unsigned short *screenpos(const struct vc_data *vc, int offset,
bool viewed) bool viewed)
{ {
unsigned short *p; unsigned long origin = viewed ? vc->vc_visible_origin : vc->vc_origin;
if (!viewed) return (unsigned short *)(origin + offset);
p = (unsigned short *)(vc->vc_origin + offset);
else if (!vc->vc_sw->con_screen_pos)
p = (unsigned short *)(vc->vc_visible_origin + offset);
else
p = vc->vc_sw->con_screen_pos(vc, offset);
return p;
} }
static void con_putc(struct vc_data *vc, u16 ca, unsigned int y, unsigned int x) static void con_putc(struct vc_data *vc, u16 ca, unsigned int y, unsigned int x)
......
...@@ -96,7 +96,6 @@ struct consw { ...@@ -96,7 +96,6 @@ struct consw {
enum vc_intensity intensity, enum vc_intensity intensity,
bool blink, bool underline, bool reverse, bool italic); bool blink, bool underline, bool reverse, bool italic);
void (*con_invert_region)(struct vc_data *vc, u16 *p, int count); void (*con_invert_region)(struct vc_data *vc, u16 *p, int count);
u16 *(*con_screen_pos)(const struct vc_data *vc, int offset);
unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position, unsigned long (*con_getxy)(struct vc_data *vc, unsigned long position,
int *px, int *py); int *px, int *py);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment