Patched in Tegra support.

author: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
committer: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
commit: 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree: a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/utdebug.c
parent: 406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
1 files changed, 33 insertions, 37 deletions
diff --git a/drivers/acpi/acpica/utdebug.c b/drivers/acpi/acpica/utdebug.c
index 5d95166245a..a9bcd816dc2 100644
--- a/drivers/acpi/acpica/utdebug.c
+++ b/drivers/acpi/acpica/utdebug.c
@@ -5,7 +5,7 @@
 *****************************************************************************/
 /*
- * Copyright (C) 2000 - 2012, Intel Corp.
+ * Copyright (C) 2000 - 2011, Intel Corp.
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -41,15 +41,13 @@
 * POSSIBILITY OF SUCH DAMAGES.
 */
-#include <linux/export.h>
 #include <acpi/acpi.h>
 #include "accommon.h"
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utdebug")
 #ifdef ACPI_DEBUG_OUTPUT
-static acpi_thread_id acpi_gbl_prev_thread_id = (acpi_thread_id) 0xFFFFFFFF;
+static acpi_thread_id acpi_gbl_prev_thread_id;
 static char *acpi_gbl_fn_entry_str = "----Entry";
 static char *acpi_gbl_fn_exit_str = "----Exit-";
@@ -110,7 +108,7 @@ void acpi_ut_track_stack_ptr(void)
 * RETURN:      Updated pointer to the function name
 *
 * DESCRIPTION: Remove the "Acpi" prefix from the function name, if present.
- *              This allows compiler macros such as __FUNCTION__ to be used
+ *              This allows compiler macros such as __func__ to be used
 *              with no change to the debug output.
 *
 ******************************************************************************/
@@ -146,7 +144,7 @@ static const char *acpi_ut_trim_function_name(const char *function_name)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              format              - Printf format field
+ *              Format              - Printf format field
 *              ...                 - Optional printf arguments
 *
 * RETURN:      None
@@ -218,12 +216,12 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              format              - Printf format field
+ *              Format              - Printf format field
 *              ...                 - Optional printf arguments
 *
 * RETURN:      None
 *
- * DESCRIPTION: Print message with no headers. Has same interface as
+ * DESCRIPTION: Print message with no headers.  Has same interface as
 *              debug_print so that the same macros can be used.
 *
 ******************************************************************************/
@@ -259,7 +257,7 @@ ACPI_EXPORT_SYMBOL(acpi_debug_print_raw)
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level
 *
 ******************************************************************************/
@@ -287,11 +285,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              pointer             - Pointer to display
+ *              Pointer             - Pointer to display
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level
 *
 ******************************************************************************/
@@ -300,7 +298,6 @@ acpi_ut_trace_ptr(u32 line_number,
                  const char *function_name,
                  const char *module_name, u32 component_id, void *pointer)
 {
        acpi_gbl_nesting_level++;
        acpi_ut_track_stack_ptr();
@@ -317,11 +314,11 @@ acpi_ut_trace_ptr(u32 line_number,
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              string              - Additional string to display
+ *              String              - Additional string to display
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level
 *
 ******************************************************************************/
@@ -348,11 +345,11 @@ acpi_ut_trace_str(u32 line_number,
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              integer             - Integer to display
+ *              Integer             - Integer to display
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function entry trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function entry trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level
 *
 ******************************************************************************/
@@ -382,7 +379,7 @@ acpi_ut_trace_u32(u32 line_number,
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level
 *
 ******************************************************************************/
@@ -410,11 +407,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              status              - Exit status code
+ *              Status              - Exit status code
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level. Prints exit status also.
 *
 ******************************************************************************/
@@ -451,11 +448,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              value               - Value to be printed with exit msg
+ *              Value               - Value to be printed with exit msg
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level. Prints exit value also.
 *
 ******************************************************************************/
@@ -483,11 +480,11 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
 *              function_name       - Caller's procedure name
 *              module_name         - Caller's module name
 *              component_id        - Caller's component ID
- *              ptr                 - Pointer to display
+ *              Ptr                 - Pointer to display
 *
 * RETURN:      None
 *
- * DESCRIPTION: Function exit trace. Prints only if TRACE_FUNCTIONS bit is
+ * DESCRIPTION: Function exit trace.  Prints only if TRACE_FUNCTIONS bit is
 *              set in debug_level. Prints exit value also.
 *
 ******************************************************************************/
@@ -510,10 +507,10 @@ acpi_ut_ptr_exit(u32 line_number,
 *
 * FUNCTION:    acpi_ut_dump_buffer
 *
- * PARAMETERS:  buffer              - Buffer to dump
+ * PARAMETERS:  Buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
+ *              Count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
+ *              Display             - BYTE, WORD, DWORD, or QWORD display
- *              offset              - Beginning buffer offset (display only)
+ *              component_iD        - Caller's component ID
 *
 * RETURN:      None
 *
@@ -521,7 +518,7 @@ acpi_ut_ptr_exit(u32 line_number,
 *
 ******************************************************************************/
-void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
+void acpi_ut_dump_buffer2(u8 * buffer, u32 count, u32 display)
 {
        u32 i = 0;
        u32 j;
@@ -543,7 +540,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
                /* Print current offset */
-                acpi_os_printf("%6.4X: ", (base_offset + i));
+                acpi_os_printf("%6.4X: ", i);
                /* Print 16 hex chars */
@@ -625,12 +622,12 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
 /*******************************************************************************
 *
- * FUNCTION:    acpi_ut_debug_dump_buffer
+ * FUNCTION:    acpi_ut_dump_buffer
 *
- * PARAMETERS:  buffer              - Buffer to dump
+ * PARAMETERS:  Buffer              - Buffer to dump
- *              count               - Amount to dump, in bytes
+ *              Count               - Amount to dump, in bytes
- *              display             - BYTE, WORD, DWORD, or QWORD display
+ *              Display             - BYTE, WORD, DWORD, or QWORD display
- *              component_ID        - Caller's component ID
+ *              component_iD        - Caller's component ID
 *
 * RETURN:      None
 *
@@ -638,8 +635,7 @@ void acpi_ut_dump_buffer(u8 *buffer, u32 count, u32 display, u32 base_offset)
 *
 ******************************************************************************/
-void
+void acpi_ut_dump_buffer(u8 * buffer, u32 count, u32 display, u32 component_id)
-acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
 {
        /* Only dump the buffer if tracing is enabled */
@@ -649,5 +645,5 @@ acpi_ut_debug_dump_buffer(u8 *buffer, u32 count, u32 display, u32 component_id)
                return;
        }
-        acpi_ut_dump_buffer(buffer, count, display, 0);
+        acpi_ut_dump_buffer2(buffer, count, display);
 }
author	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
committer	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
commit	8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree	a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/acpi/acpica/utdebug.c
parent	406089d01562f1e2bf9f089fd7637009ebaad589 (diff)