From 6778337a7a4e51ec9fa4a76846d34e8a66ca6418 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Pali=20Roh=C3=A1r?= <pali@kernel.org>

Date: Tue, 17 Mar 2020 23:25:54 +0100

Subject: [Backport 6778337a7a4e] exfat: Remove unused functions

 exfat_high_surrogate() and exfat_low_surrogate()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

After applying previous two patches, these functions are not used anymore.

Signed-off-by: Pali Rohár <pali@kernel.org>

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>

---

 src/exfat_fs.h |  2 --

 src/nls.c      | 13 -------------

 2 files changed, 15 deletions(-)

diff --git a/src/exfat_fs.h b/src/exfat_fs.h

index 1ebfb9085f1f719180051ee87aea94962accd238..3862df6af7386bd5e54ed338cedcee64c3cb6ddd 100644

--- a/src/exfat_fs.h

+++ b/src/exfat_fs.h

@@ -492,8 +492,6 @@ int exfat_nls_to_utf16(struct super_block *sb,

 		struct exfat_uni_name *uniname, int *p_lossy);

 int exfat_create_upcase_table(struct super_block *sb);

 void exfat_free_upcase_table(struct exfat_sb_info *sbi);

-unsigned short exfat_high_surrogate(unicode_t u);

-unsigned short exfat_low_surrogate(unicode_t u);

 /* exfat/misc.c */

 void __exfat_fs_error(struct super_block *sb, int report, const char *fmt, ...)

diff --git a/src/nls.c b/src/nls.c

index 2178786b708b577a385137994a41e078bedcb8b7..1ebda90cbdd7c81c507f662332a53eb52bf92606 100644

--- a/src/nls.c

+++ b/src/nls.c

@@ -535,22 +535,9 @@ static int exfat_utf8_to_utf16(struct super_block *sb,

 	return unilen;

 }

-#define PLANE_SIZE	0x00010000

 #define SURROGATE_MASK	0xfffff800

 #define SURROGATE_PAIR	0x0000d800

 #define SURROGATE_LOW	0x00000400

-#define SURROGATE_BITS	0x000003ff

-

-unsigned short exfat_high_surrogate(unicode_t u)

-{

-	return ((u - PLANE_SIZE) >> 10) + SURROGATE_PAIR;

-}

-

-unsigned short exfat_low_surrogate(unicode_t u)

-{

-	return ((u - PLANE_SIZE) & SURROGATE_BITS) | SURROGATE_PAIR |

-		SURROGATE_LOW;

-}

 static int __exfat_utf16_to_nls(struct super_block *sb,

 		struct exfat_uni_name *p_uniname, unsigned char *p_cstring,

-- 

2.31.1