vt: remove zero-width-space handling from conv_uni_to_pc()

This is now taken care of by ucs_is_zero_width().

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
Reviewed-by: Jiri Slaby <jirislaby@kernel.org>
Link: https://lore.kernel.org/r/20250417184849.475581-12-nico@fluxnic.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index 82d70083fead062c77b8cfb097c3d86dc2b56279..bb4bb272ebec566ec90b4dc5a89519116490d3d3 100644 (file)
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -870,8 +870,6 @@ int conv_uni_to_pc(struct vc_data *conp, long ucs)
                return -4;              /* Not found */
        else if (ucs < 0x20)
                return -1;              /* Not a printable character */
-       else if (ucs == 0xfeff || (ucs >= 0x200b && ucs <= 0x200f))
-               return -2;                      /* Zero-width space */
        /*
         * UNI_DIRECT_BASE indicates the start of the region in the User Zone
         * which always has a 1:1 mapping to the currently loaded font.  The

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 1bd1878094a0bdc75f65d62f8b55757229061339..24c6cd2eed78b6395c6beeb06087e14dd16a33bf 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2995,7 +2995,7 @@ static int vc_con_write_normal(struct vc_data *vc, int tc, int c,
        /* Now try to find out how to display it */
        tc = conv_uni_to_pc(vc, tc);
        if (tc & ~charmask) {
-               if (tc == -1 || tc == -2)
+               if (tc == -1)
                        return -1; /* nothing to display */
 
                /* Glyph not found */