瀏覽代碼

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>
Rasmus Villemoes 10 年之前
父節點
當前提交
40f5c777ec
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/platform/x86/thinkpad_acpi.c

+ 2 - 2
drivers/platform/x86/thinkpad_acpi.c

@@ -8878,13 +8878,13 @@ static int __must_check __init get_thinkpad_model_data(
 	}
 	}
 
 
 	s = dmi_get_system_info(DMI_PRODUCT_VERSION);
 	s = dmi_get_system_info(DMI_PRODUCT_VERSION);
-	if (s && !(strnicmp(s, "ThinkPad", 8) && strnicmp(s, "Lenovo", 6))) {
+	if (s && !(strncasecmp(s, "ThinkPad", 8) && strncasecmp(s, "Lenovo", 6))) {
 		tp->model_str = kstrdup(s, GFP_KERNEL);
 		tp->model_str = kstrdup(s, GFP_KERNEL);
 		if (!tp->model_str)
 		if (!tp->model_str)
 			return -ENOMEM;
 			return -ENOMEM;
 	} else {
 	} else {
 		s = dmi_get_system_info(DMI_BIOS_VENDOR);
 		s = dmi_get_system_info(DMI_BIOS_VENDOR);
-		if (s && !(strnicmp(s, "Lenovo", 6))) {
+		if (s && !(strncasecmp(s, "Lenovo", 6))) {
 			tp->model_str = kstrdup(s, GFP_KERNEL);
 			tp->model_str = kstrdup(s, GFP_KERNEL);
 			if (!tp->model_str)
 			if (!tp->model_str)
 				return -ENOMEM;
 				return -ENOMEM;