7 files changed, 81 insertions, 295 deletions

diff --git a/tools/power/acpi/common/cmfsize.c b/tools/power/acpi/common/cmfsize.c
index d2240e60566f..bc82596d7354 100644
--- a/tools/power/acpi/common/cmfsize.c
+++ b/tools/power/acpi/common/cmfsize.c
@@ -68,24 +68,24 @@ u32 cm_get_file_size(ACPI_FILE file)
 
         /* Save the current file pointer, seek to EOF to obtain file size */
 
-        current_offset = acpi_os_get_file_offset(file);
+        current_offset = ftell(file);
         if (current_offset < 0) {
                 goto offset_error;
         }
 
-        status = acpi_os_set_file_offset(file, 0, ACPI_FILE_END);
+        status = fseek(file, 0, SEEK_END);
         if (ACPI_FAILURE(status)) {
                 goto seek_error;
         }
 
-        file_size = acpi_os_get_file_offset(file);
+        file_size = ftell(file);
         if (file_size < 0) {
                 goto offset_error;
         }
 
         /* Restore original file pointer */
 
-        status = acpi_os_set_file_offset(file, current_offset, ACPI_FILE_BEGIN);
+        status = fseek(file, current_offset, SEEK_SET);
         if (ACPI_FAILURE(status)) {
                 goto seek_error;
         }
@@ -93,10 +93,10 @@ u32 cm_get_file_size(ACPI_FILE file)
         return ((u32)file_size);
 
 offset_error:
-        acpi_log_error("Could not get file offset");
+        fprintf(stderr, "Could not get file offset\n");
         return (ACPI_UINT32_MAX);
 
 seek_error:
-        acpi_log_error("Could not set file offset");
+        fprintf(stderr, "Could not set file offset\n");
         return (ACPI_UINT32_MAX);
 }
diff --git a/tools/power/acpi/common/getopt.c b/tools/power/acpi/common/getopt.c
index e9e80910a61d..3919970f5aea 100644
--- a/tools/power/acpi/common/getopt.c
+++ b/tools/power/acpi/common/getopt.c
@@ -57,7 +57,7 @@
 #include "acapps.h"
 
 #define ACPI_OPTION_ERROR(msg, badchar) \
-        if (acpi_gbl_opterr) {acpi_log_error ("%s%c\n", msg, badchar);}
+        if (acpi_gbl_opterr) {fprintf (stderr, "%s%c\n", msg, badchar);}
 
 int acpi_gbl_opterr = 1;
 int acpi_gbl_optind = 1;
diff --git a/tools/power/acpi/os_specific/service_layers/oslibcfs.c b/tools/power/acpi/os_specific/service_layers/oslibcfs.c
deleted file mode 100644
index 11f4aba55aab..000000000000
--- a/tools/power/acpi/os_specific/service_layers/oslibcfs.c
+++ /dev/null
@@ -1,217 +0,0 @@
-/******************************************************************************
- *
- * Module Name: oslibcfs - C library OSL for file I/O
- *
- *****************************************************************************/
-
-/*
- * Copyright (C) 2000 - 2016, Intel Corp.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    substantially similar to the "NO WARRANTY" disclaimer below
- *    ("Disclaimer") and any redistribution must be conditioned upon
- *    including a substantially similar Disclaimer requirement for further
- *    binary redistribution.
- * 3. Neither the names of the above-listed copyright holders nor the names
- *    of any contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * Alternatively, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2 as published by the Free
- * Software Foundation.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <acpi/acpi.h>
-#include <stdio.h>
-#include <stdarg.h>
-
-#define _COMPONENT          ACPI_OS_SERVICES
-ACPI_MODULE_NAME("oslibcfs")
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_open_file
- *
- * PARAMETERS:  path                - File path
- *              modes               - File operation type
- *
- * RETURN:      File descriptor.
- *
- * DESCRIPTION: Open a file for reading (ACPI_FILE_READING) or/and writing
- *              (ACPI_FILE_WRITING).
- *
- ******************************************************************************/
-ACPI_FILE acpi_os_open_file(const char *path, u8 modes)
-{
-        ACPI_FILE file;
-        u32 i = 0;
-        char modes_str[4];
-
-        if (modes & ACPI_FILE_READING) {
-                modes_str[i++] = 'r';
-        }
-        if (modes & ACPI_FILE_WRITING) {
-                modes_str[i++] = 'w';
-        }
-
-        if (modes & ACPI_FILE_BINARY) {
-                modes_str[i++] = 'b';
-        }
-
-        modes_str[i++] = '\0';
-
-        file = fopen(path, modes_str);
-        if (!file) {
-                perror("Could not open file");
-        }
-
-        return (file);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_close_file
- *
- * PARAMETERS:  file                - An open file descriptor
- *
- * RETURN:      None.
- *
- * DESCRIPTION: Close a file opened via acpi_os_open_file.
- *
- ******************************************************************************/
-
-void acpi_os_close_file(ACPI_FILE file)
-{
-
-        fclose(file);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_read_file
- *
- * PARAMETERS:  file                - An open file descriptor
- *              buffer              - Data buffer
- *              size                - Data block size
- *              count               - Number of data blocks
- *
- * RETURN:      Number of bytes actually read.
- *
- * DESCRIPTION: Read from a file.
- *
- ******************************************************************************/
-
-int
-acpi_os_read_file(ACPI_FILE file, void *buffer, acpi_size size, acpi_size count)
-{
-        int length;
-
-        length = fread(buffer, size, count, file);
-        if (length < 0) {
-                perror("Error reading file");
-        }
-
-        return (length);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_write_file
- *
- * PARAMETERS:  file                - An open file descriptor
- *              buffer              - Data buffer
- *              size                - Data block size
- *              count               - Number of data blocks
- *
- * RETURN:      Number of bytes actually written.
- *
- * DESCRIPTION: Write to a file.
- *
- ******************************************************************************/
-
-int
-acpi_os_write_file(ACPI_FILE file,
-                   void *buffer, acpi_size size, acpi_size count)
-{
-        int length;
-
-        length = fwrite(buffer, size, count, file);
-        if (length < 0) {
-                perror("Error writing file");
-        }
-
-        return (length);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_get_file_offset
- *
- * PARAMETERS:  file                - An open file descriptor
- *
- * RETURN:      Current file pointer position.
- *
- * DESCRIPTION: Get current file offset.
- *
- ******************************************************************************/
-
-long acpi_os_get_file_offset(ACPI_FILE file)
-{
-        long offset;
-
-        offset = ftell(file);
-        return (offset);
-}
-
-/*******************************************************************************
- *
- * FUNCTION:    acpi_os_set_file_offset
- *
- * PARAMETERS:  file                - An open file descriptor
- *              offset              - New file offset
- *              from                - From begin/end of file
- *
- * RETURN:      Status
- *
- * DESCRIPTION: Set current file offset.
- *
- ******************************************************************************/
-
-acpi_status acpi_os_set_file_offset(ACPI_FILE file, long offset, u8 from)
-{
-        int ret = 0;
-
-        if (from == ACPI_FILE_BEGIN) {
-                ret = fseek(file, offset, SEEK_SET);
-        }
-
-        if (from == ACPI_FILE_END) {
-                ret = fseek(file, offset, SEEK_END);
-        }
-
-        if (ret < 0) {
-                return (AE_ERROR);
-        } else {
-                return (AE_OK);
-        }
-}
diff --git a/tools/power/acpi/tools/acpidump/Makefile b/tools/power/acpi/tools/acpidump/Makefile
index 2942cdced2ad..a710f60290ee 100644
--- a/tools/power/acpi/tools/acpidump/Makefile
+++ b/tools/power/acpi/tools/acpidump/Makefile
@@ -41,7 +41,6 @@ TOOL_OBJS = \
         utprint.o\
         utstring.o\
         utxferror.o\
-        oslibcfs.o\
         oslinuxtbl.o\
         cmfsize.o\
         getopt.o
diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
index 2a1507c89dbf..1c4e00bd8acb 100644
--- a/tools/power/acpi/tools/acpidump/apdump.c
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -69,16 +69,17 @@ u8 ap_is_valid_header(struct acpi_table_header *table)
                 /* Make sure signature is all ASCII and a valid ACPI name */
 
                 if (!acpi_ut_valid_nameseg(table->signature)) {
-                        acpi_log_error("Table signature (0x%8.8X) is invalid\n",
-                                       *(u32 *)table->signature);
+                        fprintf(stderr,
+                                "Table signature (0x%8.8X) is invalid\n",
+                                *(u32 *)table->signature);
                         return (FALSE);
                 }
 
                 /* Check for minimum table length */
 
                 if (table->length < sizeof(struct acpi_table_header)) {
-                        acpi_log_error("Table length (0x%8.8X) is invalid\n",
-                                       table->length);
+                        fprintf(stderr, "Table length (0x%8.8X) is invalid\n",
+                                table->length);
                         return (FALSE);
                 }
         }
@@ -115,8 +116,8 @@ u8 ap_is_valid_checksum(struct acpi_table_header *table)
         }
 
         if (ACPI_FAILURE(status)) {
-                acpi_log_error("%4.4s: Warning: wrong checksum in table\n",
-                               table->signature);
+                fprintf(stderr, "%4.4s: Warning: wrong checksum in table\n",
+                        table->signature);
         }
 
         return (AE_OK);
@@ -239,14 +240,14 @@ int ap_dump_all_tables(void)
                         if (status == AE_LIMIT) {
                                 return (0);
                         } else if (i == 0) {
-                                acpi_log_error
-                                    ("Could not get ACPI tables, %s\n",
-                                     acpi_format_exception(status));
+                                fprintf(stderr,
+                                        "Could not get ACPI tables, %s\n",
+                                        acpi_format_exception(status));
                                 return (-1);
                         } else {
-                                acpi_log_error
-                                    ("Could not get ACPI table at index %u, %s\n",
-                                     i, acpi_format_exception(status));
+                                fprintf(stderr,
+                                        "Could not get ACPI table at index %u, %s\n",
+                                        i, acpi_format_exception(status));
                                 continue;
                         }
                 }
@@ -289,17 +290,17 @@ int ap_dump_table_by_address(char *ascii_address)
         status = acpi_ut_strtoul64(ascii_address, ACPI_ANY_BASE,
                                    ACPI_MAX64_BYTE_WIDTH, &long_address);
         if (ACPI_FAILURE(status)) {
-                acpi_log_error("%s: Could not convert to a physical address\n",
-                               ascii_address);
+                fprintf(stderr, "%s: Could not convert to a physical address\n",
+                        ascii_address);
                 return (-1);
         }
 
         address = (acpi_physical_address)long_address;
         status = acpi_os_get_table_by_address(address, &table);
         if (ACPI_FAILURE(status)) {
-                acpi_log_error("Could not get table at 0x%8.8X%8.8X, %s\n",
-                               ACPI_FORMAT_UINT64(address),
-                               acpi_format_exception(status));
+                fprintf(stderr, "Could not get table at 0x%8.8X%8.8X, %s\n",
+                        ACPI_FORMAT_UINT64(address),
+                        acpi_format_exception(status));
                 return (-1);
         }
 
@@ -331,9 +332,9 @@ int ap_dump_table_by_name(char *signature)
         int table_status;
 
         if (strlen(signature) != ACPI_NAME_SIZE) {
-                acpi_log_error
-                    ("Invalid table signature [%s]: must be exactly 4 characters\n",
-                     signature);
+                fprintf(stderr,
+                        "Invalid table signature [%s]: must be exactly 4 characters\n",
+                        signature);
                 return (-1);
         }
 
@@ -363,9 +364,9 @@ int ap_dump_table_by_name(char *signature)
                                 return (0);
                         }
 
-                        acpi_log_error
-                            ("Could not get ACPI table with signature [%s], %s\n",
-                             local_signature, acpi_format_exception(status));
+                        fprintf(stderr,
+                                "Could not get ACPI table with signature [%s], %s\n",
+                                local_signature, acpi_format_exception(status));
                         return (-1);
                 }
 
@@ -408,24 +409,24 @@ int ap_dump_table_from_file(char *pathname)
         }
 
         if (!acpi_ut_valid_nameseg(table->signature)) {
-                acpi_log_error
-                    ("No valid ACPI signature was found in input file %s\n",
-                     pathname);
+                fprintf(stderr,
+                        "No valid ACPI signature was found in input file %s\n",
+                        pathname);
         }
 
         /* File must be at least as long as the table length */
 
         if (table->length > file_size) {
-                acpi_log_error
-                    ("Table length (0x%X) is too large for input file (0x%X) %s\n",
-                     table->length, file_size, pathname);
+                fprintf(stderr,
+                        "Table length (0x%X) is too large for input file (0x%X) %s\n",
+                        table->length, file_size, pathname);
                 goto exit;
         }
 
         if (gbl_verbose_mode) {
-                acpi_log_error
-                    ("Input file:  %s contains table [%4.4s], 0x%X (%u) bytes\n",
-                     pathname, table->signature, file_size, file_size);
+                fprintf(stderr,
+                        "Input file:  %s contains table [%4.4s], 0x%X (%u) bytes\n",
+                        pathname, table->signature, file_size, file_size);
         }
 
         table_status = ap_dump_table_buffer(table, 0, 0);
diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c
index 71edeb499096..dd5b861dc4a8 100644
--- a/tools/power/acpi/tools/acpidump/apfiles.c
+++ b/tools/power/acpi/tools/acpidump/apfiles.c
@@ -65,7 +65,8 @@ static int ap_is_existing_file(char *pathname)
         struct stat stat_info;
 
         if (!stat(pathname, &stat_info)) {
-                acpi_log_error("Target path already exists, overwrite? [y|n] ");
+                fprintf(stderr,
+                        "Target path already exists, overwrite? [y|n] ");
 
                 if (getchar() != 'y') {
                         return (-1);
@@ -101,9 +102,9 @@ int ap_open_output_file(char *pathname)
 
         /* Point stdout to the file */
 
-        file = acpi_os_open_file(pathname, ACPI_FILE_WRITING);
+        file = fopen(pathname, "w");
         if (!file) {
-                acpi_log_error("Could not open output file: %s\n", pathname);
+                fprintf(stderr, "Could not open output file: %s\n", pathname);
                 return (-1);
         }
 
@@ -164,29 +165,29 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
         strcat(filename, FILE_SUFFIX_BINARY_TABLE);
 
         if (gbl_verbose_mode) {
-                acpi_log_error
-                    ("Writing [%4.4s] to binary file: %s 0x%X (%u) bytes\n",
-                     table->signature, filename, table->length, table->length);
+                fprintf(stderr,
+                        "Writing [%4.4s] to binary file: %s 0x%X (%u) bytes\n",
+                        table->signature, filename, table->length,
+                        table->length);
         }
 
         /* Open the file and dump the entire table in binary mode */
 
-        file = acpi_os_open_file(filename,
-                                 ACPI_FILE_WRITING | ACPI_FILE_BINARY);
+        file = fopen(filename, "wb");
         if (!file) {
-                acpi_log_error("Could not open output file: %s\n", filename);
+                fprintf(stderr, "Could not open output file: %s\n", filename);
                 return (-1);
         }
 
-        actual = acpi_os_write_file(file, table, 1, table_length);
+        actual = fwrite(table, 1, table_length, file);
         if (actual != table_length) {
-                acpi_log_error("Error writing binary output file: %s\n",
-                               filename);
-                acpi_os_close_file(file);
+                fprintf(stderr, "Error writing binary output file: %s\n",
+                        filename);
+                fclose(file);
                 return (-1);
         }
 
-        acpi_os_close_file(file);
+        fclose(file);
         return (0);
 }
 
@@ -213,10 +214,9 @@ struct acpi_table_header *ap_get_table_from_file(char *pathname,
 
         /* Must use binary mode */
 
-        file =
-            acpi_os_open_file(pathname, ACPI_FILE_READING | ACPI_FILE_BINARY);
+        file = fopen(pathname, "rb");
         if (!file) {
-                acpi_log_error("Could not open input file: %s\n", pathname);
+                fprintf(stderr, "Could not open input file: %s\n", pathname);
                 return (NULL);
         }
 
@@ -224,7 +224,8 @@ struct acpi_table_header *ap_get_table_from_file(char *pathname,
 
         file_size = cm_get_file_size(file);
         if (file_size == ACPI_UINT32_MAX) {
-                acpi_log_error("Could not get input file size: %s\n", pathname);
+                fprintf(stderr,
+                        "Could not get input file size: %s\n", pathname);
                 goto cleanup;
         }
 
@@ -232,16 +233,17 @@ struct acpi_table_header *ap_get_table_from_file(char *pathname,
 
         buffer = ACPI_ALLOCATE_ZEROED(file_size);
         if (!buffer) {
-                acpi_log_error("Could not allocate file buffer of size: %u\n",
-                               file_size);
+                fprintf(stderr,
+                        "Could not allocate file buffer of size: %u\n",
+                        file_size);
                 goto cleanup;
         }
 
         /* Read the entire file */
 
-        actual = acpi_os_read_file(file, buffer, 1, file_size);
+        actual = fread(buffer, 1, file_size, file);
         if (actual != file_size) {
-                acpi_log_error("Could not read input file: %s\n", pathname);
+                fprintf(stderr, "Could not read input file: %s\n", pathname);
                 ACPI_FREE(buffer);
                 buffer = NULL;
                 goto cleanup;
@@ -250,6 +252,6 @@ struct acpi_table_header *ap_get_table_from_file(char *pathname,
         *out_file_size = file_size;
 
 cleanup:
-        acpi_os_close_file(file);
+        fclose(file);
         return (buffer);
 }
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index 17ce0d7ef29d..f32968e22af5 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -139,8 +139,8 @@ static int ap_insert_action(char *argument, u32 to_be_done)
 
         current_action++;
         if (current_action > AP_MAX_ACTIONS) {
-                acpi_log_error("Too many table options (max %u)\n",
-                               AP_MAX_ACTIONS);
+                fprintf(stderr, "Too many table options (max %u)\n",
+                        AP_MAX_ACTIONS);
                 return (-1);
         }
 
@@ -185,9 +185,9 @@ static int ap_do_options(int argc, char **argv)
                         } else if (!strcmp(acpi_gbl_optarg, "off")) {
                                 gbl_dump_customized_tables = FALSE;
                         } else {
-                                acpi_log_error
-                                    ("%s: Cannot handle this switch, please use on|off\n",
-                                     acpi_gbl_optarg);
+                                fprintf(stderr,
+                                        "%s: Cannot handle this switch, please use on|off\n",
+                                        acpi_gbl_optarg);
                                 return (-1);
                         }
                         continue;
@@ -212,9 +212,9 @@ static int ap_do_options(int argc, char **argv)
                                               ACPI_MAX64_BYTE_WIDTH,
                                               &gbl_rsdp_base);
                         if (ACPI_FAILURE(status)) {
-                                acpi_log_error
-                                    ("%s: Could not convert to a physical address\n",
-                                     acpi_gbl_optarg);
+                                fprintf(stderr,
+                                        "%s: Could not convert to a physical address\n",
+                                        acpi_gbl_optarg);
                                 return (-1);
                         }
                         continue;
@@ -241,7 +241,7 @@ static int ap_do_options(int argc, char **argv)
                 case 'z':       /* Verbose mode */
 
                         gbl_verbose_mode = TRUE;
-                        acpi_log_error(ACPI_COMMON_SIGNON(AP_UTILITY_NAME));
+                        fprintf(stderr, ACPI_COMMON_SIGNON(AP_UTILITY_NAME));
                         continue;
 
                         /*
@@ -353,8 +353,9 @@ int ACPI_SYSTEM_XFACE acpi_main(int argc, char *argv[])
 
                 default:
 
-                        acpi_log_error("Internal error, invalid action: 0x%X\n",
-                                       action->to_be_done);
+                        fprintf(stderr,
+                                "Internal error, invalid action: 0x%X\n",
+                                action->to_be_done);
                         return (-1);
                 }
 
@@ -369,12 +370,12 @@ int ACPI_SYSTEM_XFACE acpi_main(int argc, char *argv[])
                         /* Summary for the output file */
 
                         file_size = cm_get_file_size(gbl_output_file);
-                        acpi_log_error
-                            ("Output file %s contains 0x%X (%u) bytes\n\n",
-                             gbl_output_filename, file_size, file_size);
+                        fprintf(stderr,
+                                "Output file %s contains 0x%X (%u) bytes\n\n",
+                                gbl_output_filename, file_size, file_size);
                 }
 
-                acpi_os_close_file(gbl_output_file);
+                fclose(gbl_output_file);
         }
 
         return (status);