2 files changed, 8 insertions, 9 deletions

diff --git a/tools/power/acpi/common/getopt.c b/tools/power/acpi/common/getopt.c
index a302f52e4fd3..2f0f34a36db4 100644
--- a/tools/power/acpi/common/getopt.c
+++ b/tools/power/acpi/common/getopt.c
@@ -51,14 +51,12 @@
  *    "f|"      - Option has required single-char sub-options
  */
 
-#include <stdio.h>
-#include <string.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #include "acapps.h"
 
 #define ACPI_OPTION_ERROR(msg, badchar) \
-        if (acpi_gbl_opterr) {fprintf (stderr, "%s%c\n", msg, badchar);}
+        if (acpi_gbl_opterr) {acpi_log_error ("%s%c\n", msg, badchar);}
 
 int acpi_gbl_opterr = 1;
 int acpi_gbl_optind = 1;
@@ -113,7 +111,7 @@ int acpi_getopt_argument(int argc, char **argv)
  * PARAMETERS:  argc, argv          - from main
  *              opts                - options info list
  *
- * RETURN:      Option character or EOF
+ * RETURN:      Option character or ACPI_OPT_END
  *
  * DESCRIPTION: Get the next option
  *
@@ -128,10 +126,10 @@ int acpi_getopt(int argc, char **argv, char *opts)
                 if (acpi_gbl_optind >= argc ||
                     argv[acpi_gbl_optind][0] != '-' ||
                     argv[acpi_gbl_optind][1] == '\0') {
-                        return (EOF);
-                } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
+                        return (ACPI_OPT_END);
+                } else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) {
                         acpi_gbl_optind++;
-                        return (EOF);
+                        return (ACPI_OPT_END);
                 }
         }
 
@@ -142,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
         /* Make sure that the option is legal */
 
         if (current_char == ':' ||
-            (opts_ptr = strchr(opts, current_char)) == NULL) {
+            (opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) {
                 ACPI_OPTION_ERROR("Illegal option: -", current_char);
 
                 if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index 2a06a864c093..9c3b259aed2c 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -166,7 +166,8 @@ static int ap_do_options(int argc, char **argv)
 
         /* Command line options */
 
-        while ((j = acpi_getopt(argc, argv, AP_SUPPORTED_OPTIONS)) != EOF)
+        while ((j =
+                acpi_getopt(argc, argv, AP_SUPPORTED_OPTIONS)) != ACPI_OPT_END)
                 switch (j) {
                         /*
                          * Global options