1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
index 757b2d92d5b0..acba0b9f4406 100644
--- a/drivers/firmware/google/gsmi.c
+++ b/drivers/firmware/google/gsmi.c
@@ -28,6 +28,7 @@
 #include <linux/reboot.h>
 #include <linux/efi.h>
 #include <linux/module.h>
+#include <linux/ucs2_string.h>
 
 #define GSMI_SHUTDOWN_CLEAN     0       /* Clean Shutdown */
 /* TODO(mikew@google.com): Tie in HARDLOCKUP_DETECTOR with NMIWDT */
@@ -300,7 +301,7 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name,
         };
         efi_status_t ret = EFI_SUCCESS;
         unsigned long flags;
-        size_t name_len = utf16_strnlen(name, GSMI_BUF_SIZE / 2);
+        size_t name_len = ucs2_strnlen(name, GSMI_BUF_SIZE / 2);
         int rc;
 
         if (name_len >= GSMI_BUF_SIZE / 2)
@@ -369,7 +370,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size,
                 return EFI_BAD_BUFFER_SIZE;
 
         /* Let's make sure the thing is at least null-terminated */
-        if (utf16_strnlen(name, GSMI_BUF_SIZE / 2) == GSMI_BUF_SIZE / 2)
+        if (ucs2_strnlen(name, GSMI_BUF_SIZE / 2) == GSMI_BUF_SIZE / 2)
                 return EFI_INVALID_PARAMETER;
 
         spin_lock_irqsave(&gsmi_dev.lock, flags);
@@ -397,7 +398,7 @@ static efi_status_t gsmi_get_next_variable(unsigned long *name_size,
 
                 /* Copy the name back */
                 memcpy(name, gsmi_dev.name_buf->start, GSMI_BUF_SIZE);
-                *name_size = utf16_strnlen(name, GSMI_BUF_SIZE / 2) * 2;
+                *name_size = ucs2_strnlen(name, GSMI_BUF_SIZE / 2) * 2;
 
                 /* copy guid to return buffer */
                 memcpy(vendor, &param.guid, sizeof(param.guid));
@@ -423,7 +424,7 @@ static efi_status_t gsmi_set_variable(efi_char16_t *name,
                               EFI_VARIABLE_BOOTSERVICE_ACCESS |
                               EFI_VARIABLE_RUNTIME_ACCESS,
         };
-        size_t name_len = utf16_strnlen(name, GSMI_BUF_SIZE / 2);
+        size_t name_len = ucs2_strnlen(name, GSMI_BUF_SIZE / 2);
         efi_status_t ret = EFI_SUCCESS;
         int rc;
         unsigned long flags;