These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / tools / power / acpi / common / getopt.c

diff --git a/kernel/tools/power/acpi/common/getopt.c b/kernel/tools/power/acpi/common/getopt.c
index 5da129e..326e826 100644 (file)
--- a/kernel/tools/power/acpi/common/getopt.c
+++ b/kernel/tools/power/acpi/common/getopt.c
@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
                    argv[acpi_gbl_optind][0] != '-' ||
                    argv[acpi_gbl_optind][1] == '\0') {
                        return (ACPI_OPT_END);
-               } else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) {
+               } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
                        acpi_gbl_optind++;
                        return (ACPI_OPT_END);
                }
@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
        /* Make sure that the option is legal */
 
        if (current_char == ':' ||
-           (opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) {
+           (opts_ptr = strchr(opts, current_char)) == NULL) {
                ACPI_OPTION_ERROR("Illegal option: -", current_char);
 
                if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {