diff options
| author | Andy Grover <agrover@aracnet.com> | 2002-06-11 22:41:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@penguin.transmeta.com> | 2002-06-11 22:41:08 -0700 |
| commit | 82edfcdc876d96fc60e97d9a265f97905b111001 (patch) | |
| tree | 6c2b3bbf37743c7ab00f81203f825816782a2566 | |
| parent | b6f1199234a80ce8ce06ff5052f80d3af14a1791 (diff) | |
[PATCH] ACPI cleanups [2/2]
This allows compilation without ACPI_DEBUG defined.
| -rw-r--r-- | drivers/acpi/include/acutils.h | 7 | ||||
| -rw-r--r-- | drivers/acpi/utilities/utglobal.c | 70 |
2 files changed, 38 insertions, 39 deletions
diff --git a/drivers/acpi/include/acutils.h b/drivers/acpi/include/acutils.h index 32c308fb0cfe..46ea89bafd70 100644 --- a/drivers/acpi/include/acutils.h +++ b/drivers/acpi/include/acutils.h @@ -1,7 +1,7 @@ /****************************************************************************** * * Name: acutils.h -- prototypes for the common (subsystem-wide) procedures - * $Revision: 139 $ + * $Revision: 140 $ * *****************************************************************************/ @@ -100,6 +100,8 @@ NATIVE_CHAR * acpi_ut_get_mutex_name ( u32 mutex_id); +#endif + NATIVE_CHAR * acpi_ut_get_type_name ( acpi_object_type type); @@ -108,9 +110,6 @@ NATIVE_CHAR * acpi_ut_get_object_type_name ( acpi_operand_object *obj_desc); -#endif - - NATIVE_CHAR * acpi_ut_get_region_name ( u8 space_id); diff --git a/drivers/acpi/utilities/utglobal.c b/drivers/acpi/utilities/utglobal.c index 838b1db986bd..d9d74956815a 100644 --- a/drivers/acpi/utilities/utglobal.c +++ b/drivers/acpi/utilities/utglobal.c @@ -1,7 +1,7 @@ /****************************************************************************** * * Module Name: utglobal - Global variables for the ACPI subsystem - * $Revision: 162 $ + * $Revision: 163 $ * *****************************************************************************/ @@ -427,40 +427,6 @@ acpi_ut_get_event_name ( } -#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) - -/* - * Strings and procedures used for debug only - * - */ - - -/***************************************************************************** - * - * FUNCTION: Acpi_ut_get_mutex_name - * - * PARAMETERS: None. - * - * RETURN: Status - * - * DESCRIPTION: Translate a mutex ID into a name string (Debug only) - * - ****************************************************************************/ - -NATIVE_CHAR * -acpi_ut_get_mutex_name ( - u32 mutex_id) -{ - - if (mutex_id > MAX_MTX) - { - return ("Invalid Mutex ID"); - } - - return (acpi_gbl_mutex_names[mutex_id]); -} - - /***************************************************************************** * * FUNCTION: Acpi_ut_get_type_name @@ -555,6 +521,40 @@ acpi_ut_get_object_type_name ( } +#if defined(ACPI_DEBUG) || defined(ENABLE_DEBUGGER) + +/* + * Strings and procedures used for debug only + * + */ + + +/***************************************************************************** + * + * FUNCTION: Acpi_ut_get_mutex_name + * + * PARAMETERS: None. + * + * RETURN: Status + * + * DESCRIPTION: Translate a mutex ID into a name string (Debug only) + * + ****************************************************************************/ + +NATIVE_CHAR * +acpi_ut_get_mutex_name ( + u32 mutex_id) +{ + + if (mutex_id > MAX_MTX) + { + return ("Invalid Mutex ID"); + } + + return (acpi_gbl_mutex_names[mutex_id]); +} + + /* Various strings for future use */ #if 0 |