aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware/efivars.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-02-03 19:53:46 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-04-17 08:28:21 +0100
commitd5abc7c1050ab2b9556a4bf21626cd74e83cd086 (patch)
treec38123d5676d331d9562a7f2620b470743b80f09 /drivers/firmware/efivars.c
parentLinux 3.9-rc5 (diff)
downloadlinux-dev-d5abc7c1050ab2b9556a4bf21626cd74e83cd086.tar.xz
linux-dev-d5abc7c1050ab2b9556a4bf21626cd74e83cd086.zip
efi: move utf16 string functions to efi.h
There are currently two implementations of the utf16 string functions. Somewhat confusingly, they've got different names. Centralise the functions in efi.h. Reviewed-by: Tom Gundersen <teg@jklm.no> Tested-by: Tom Gundersen <teg@jklm.no> Reviewed-by: Mike Waychison <mikew@google.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to '')
-rw-r--r--drivers/firmware/efivars.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 7acafb80fd4c..34c8783a2aa8 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -172,23 +172,6 @@ static void efivar_update_sysfs_entries(struct work_struct *);
static DECLARE_WORK(efivar_work, efivar_update_sysfs_entries);
static bool efivar_wq_enabled = true;
-/* Return the number of unicode characters in data */
-static unsigned long
-utf16_strnlen(efi_char16_t *s, size_t maxlength)
-{
- unsigned long length = 0;
-
- while (*s++ != 0 && length < maxlength)
- length++;
- return length;
-}
-
-static inline unsigned long
-utf16_strlen(efi_char16_t *s)
-{
- return utf16_strnlen(s, ~0UL);
-}
-
/*
* Return the number of bytes is the length of this string
* Note: this is NOT the same as the number of unicode characters