thinkpad_acpi: replace strnicmp with strncasecmp
authorRasmus Villemoes <linux@rasmusvillemoes.dk>
Mon, 13 Oct 2014 22:54:52 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2014 00:18:25 +0000 (02:18 +0200)
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>
drivers/platform/x86/thinkpad_acpi.c

index f959978c7aacdfca1da94b25021f1c86af1bcfb4..cf0f89364d4411f8321bdf69bff7b64725b5612f 100644 (file)
@@ -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);
                if (!tp->model_str)
                        return -ENOMEM;
        } else {
                s = dmi_get_system_info(DMI_BIOS_VENDOR);
                tp->model_str = kstrdup(s, GFP_KERNEL);
                if (!tp->model_str)
                        return -ENOMEM;
        } else {
                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);
                        if (!tp->model_str)
                                return -ENOMEM;
                        tp->model_str = kstrdup(s, GFP_KERNEL);
                        if (!tp->model_str)
                                return -ENOMEM;