aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/platform/x86/thinkpad_acpi.c
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2014-10-13 18:54:52 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 20:18:25 -0400
commit40f5c777ec61d908ffc7f2a6ccbed60d9930a1f8 (patch)
tree9e35ce6c7f67024d6bdd9818862ee935f990e30e /drivers/platform/x86/thinkpad_acpi.c
parent30614cf34105c5b5b9a39c65a2ea32c58b03aa8e (diff)
thinkpad_acpi: replace strnicmp with strncasecmp
The kernel used to contain two functions for length-delimited, case-insensitive string comparison, strnicmp with correct semantics and a slightly buggy strncasecmp. The latter is the POSIX name, so strnicmp was renamed to strncasecmp, and strnicmp made into a wrapper for the new strncasecmp to avoid breaking existing users. To allow the compat wrapper strnicmp to be removed at some point in the future, and to avoid the extra indirection cost, do s/strnicmp/strncasecmp/g. Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br> Cc: Darren Hart <dvhart@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/platform/x86/thinkpad_acpi.c')
-rw-r--r--drivers/platform/x86/thinkpad_acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
index f959978c7aac..cf0f89364d44 100644
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
@@ -8878,13 +8878,13 @@ static int __must_check __init get_thinkpad_model_data(
8878 } 8878 }
8879 8879
8880 s = dmi_get_system_info(DMI_PRODUCT_VERSION); 8880 s = dmi_get_system_info(DMI_PRODUCT_VERSION);
8881 if (s && !(strnicmp(s, "ThinkPad", 8) && strnicmp(s, "Lenovo", 6))) { 8881 if (s && !(strncasecmp(s, "ThinkPad", 8) && strncasecmp(s, "Lenovo", 6))) {
8882 tp->model_str = kstrdup(s, GFP_KERNEL); 8882 tp->model_str = kstrdup(s, GFP_KERNEL);
8883 if (!tp->model_str) 8883 if (!tp->model_str)
8884 return -ENOMEM; 8884 return -ENOMEM;
8885 } else { 8885 } else {
8886 s = dmi_get_system_info(DMI_BIOS_VENDOR); 8886 s = dmi_get_system_info(DMI_BIOS_VENDOR);
8887 if (s && !(strnicmp(s, "Lenovo", 6))) { 8887 if (s && !(strncasecmp(s, "Lenovo", 6))) {
8888 tp->model_str = kstrdup(s, GFP_KERNEL); 8888 tp->model_str = kstrdup(s, GFP_KERNEL);
8889 if (!tp->model_str) 8889 if (!tp->model_str)
8890 return -ENOMEM; 8890 return -ENOMEM;