AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-14 15:46:07 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

vc: move translation out of do_con_write

Browse Source 
Now that we reordered the code and the label, we can eliminate the
translation into a separate function. We call it vc_translate here.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20200615074910.19267-16-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2020-06-15 09:48:48 +02:00 committed by Greg Kroah-Hartman
parent 0d1ffef578
commit a4236348f4
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/tty/vt/vt.c
View File

@ -2658,6 +2658,19 @@ static int vc_translate_unicode(struct vc_data *vc, int c, bool *rescan)
return -1; return -1;
} }
static int vc_translate(struct vc_data *vc, int *c, bool *rescan)
{
/* Do no translation at all in control states */
if (vc->vc_state != ESnormal)
return *c;
if (vc->vc_utf && !vc->vc_disp_ctrl)
return *c = vc_translate_unicode(vc, *c, rescan);
/* no utf or alternate charset mode */
return vc_translate_ascii(vc, *c);
}
static inline unsigned char vc_invert_attr(const struct vc_data *vc) static inline unsigned char vc_invert_attr(const struct vc_data *vc)
{ {
if (!vc->vc_can_do_color) if (!vc->vc_can_do_color)
@ -2726,16 +2739,9 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
inverse = false; inverse = false;
width = 1; width = 1;
/* Do no translation at all in control states */ tc = vc_translate(vc, &c, &rescan);
if (vc->vc_state != ESnormal) { if (tc == -1)
tc = c; continue;
} else if (vc->vc_utf && !vc->vc_disp_ctrl) {
tc = c = vc_translate_unicode(vc, c, &rescan);
if (tc == -1)
continue;
} else { /* no utf or alternate charset mode */
tc = vc_translate_ascii(vc, c);
}
param.c = tc; param.c = tc;
if (atomic_notifier_call_chain(&vt_notifier_list, VT_PREWRITE, if (atomic_notifier_call_chain(&vt_notifier_list, VT_PREWRITE,