adjust _acpi_{module,function}_name definitions

PATCH New Jan Beulich 1 participant 1 message Apr 4, 2008

Subsystems (2)

ACPI ACPI component architecture (acpica)

lore

Share & tools

lore

Jan Beulich

author

2008-04-04 12:34 UTC #0 lore raw

PATCH 1/1 adjust _acpi_{module,function}_name definitions

_acpi_{module,function}_name have no need to be (static) pointers to static string literals - they can just be arrays, reducing memory footprint. _acpi_module_name also can be 'const' qualified (requires adding 'const' qualifiers to various functions' parameters), and _acpi_function_name can be static (removing the code needed to initialize the variable.

Signed-off-by Jan Beulich <[email protected]>

---
 drivers/acpi/executer/exdump.c    |    4 +-
 drivers/acpi/namespace/nsutils.c  |   23 ++++++++---------
 drivers/acpi/utilities/utdebug.c  |   30 +++++++++++-----------
 drivers/acpi/utilities/utmisc.c   |   11 ++++----
 drivers/acpi/utilities/utobject.c |    4 +-
 include/acpi/acinterp.h           |    5 ++-
 include/acpi/aclocal.h            |    4 +-
 include/acpi/acmacros.h           |    7 ++---
 include/acpi/acnamesp.h           |   19 +++++++-------
 include/acpi/acutils.h            |   51 +++++++++++++++++---------------------
 10 files changed, 78 insertions(+), 80 deletions(-)

drivers/acpi/executer/exdump.c +2 -2

@@ -767,9 +767,9 @@ void acpi_ex_dump_operand(union acpi_ope
 void
 acpi_ex_dump_operands(union acpi_operand_object **operands,
 		      acpi_interpreter_mode interpreter_mode,
-		      char *ident,
+		      const char *ident,
 		      u32 num_levels,
-		      char *note, char *module_name, u32 line_number)
+		      const char *note, const char *module_name, u32 line_number)
 {
 	acpi_native_uint i;

drivers/acpi/namespace/nsutils.c +12 ~~-11~~

@@ -73,9 +73,9 @@ acpi_name acpi_ns_find_parent_name(struc
  ******************************************************************************/
 
 void
-acpi_ns_report_error(char *module_name,
+acpi_ns_report_error(const char *module_name,
 		     u32 line_number,
-		     char *internal_name, acpi_status lookup_status)
+		     const char *internal_name, acpi_status lookup_status)
 {
 	acpi_status status;
 	u32 bad_name;

@@ -130,11 +130,11 @@ acpi_ns_report_error(char *module_name,
  ******************************************************************************/
 
 void
-acpi_ns_report_method_error(char *module_name,
+acpi_ns_report_method_error(const char *module_name,
 			    u32 line_number,
-			    char *message,
+			    const char *message,
 			    struct acpi_namespace_node *prefix_node,
-			    char *path, acpi_status method_status)
+			    const char *path, acpi_status method_status)
 {
 	acpi_status status;
 	struct acpi_namespace_node *node = prefix_node;

@@ -167,7 +167,7 @@ acpi_ns_report_method_error(char *module
  ******************************************************************************/
 
 void
-acpi_ns_print_node_pathname(struct acpi_namespace_node *node, char *message)
+acpi_ns_print_node_pathname(struct acpi_namespace_node *node, const char *message)
 {
 	struct acpi_buffer buffer;
 	acpi_status status;

@@ -296,7 +296,7 @@ u32 acpi_ns_local(acpi_object_type type)
 
 void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info)
 {
-	char *next_external_char;
+	const char *next_external_char;
 	u32 i;
 
 	ACPI_FUNCTION_ENTRY();

@@ -363,7 +363,7 @@ acpi_status acpi_ns_build_internal_name(
 {
 	u32 num_segments = info->num_segments;
 	char *internal_name = info->internal_name;
-	char *external_name = info->next_external_char;
+	const char *external_name = info->next_external_char;
 	char *result = NULL;
 	acpi_native_uint i;

@@ -472,7 +472,8 @@ acpi_status acpi_ns_build_internal_name(
  *
  *******************************************************************************/
 
-acpi_status acpi_ns_internalize_name(char *external_name, char **converted_name)
+acpi_status acpi_ns_internalize_name(const char *external_name,
+				     char **converted_name)
 {
 	char *internal_name;
 	struct acpi_namestring_info info;

@@ -528,7 +529,7 @@ acpi_status acpi_ns_internalize_name(cha
 
 acpi_status
 acpi_ns_externalize_name(u32 internal_name_length,
-			 char *internal_name,
+			 const char *internal_name,
 			 u32 * converted_name_length, char **converted_name)
 {
 	acpi_native_uint names_index = 0;

@@ -823,7 +824,7 @@ u32 acpi_ns_opens_scope(acpi_object_type
 
 acpi_status
 acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
-		 char *pathname,
+		 const char *pathname,
 		 u32 flags, struct acpi_namespace_node **return_node)
 {
 	union acpi_generic_state scope_info;

drivers/acpi/utilities/utdebug.c +15 ~~-15~~

@@ -158,8 +158,8 @@ static const char *acpi_ut_trim_function
 void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print(u32 requested_debug_level,
 		    u32 line_number,
-		    const char *function_name,
-		    char *module_name, u32 component_id, char *format, ...)
+		    const char *function_name, const char *module_name,
+		    u32 component_id, const char *format, ...)
 {
 	acpi_thread_id thread_id;
 	va_list args;

@@ -228,8 +228,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print)
 void ACPI_INTERNAL_VAR_XFACE
 acpi_ut_debug_print_raw(u32 requested_debug_level,
 			u32 line_number,
-			const char *function_name,
-			char *module_name, u32 component_id, char *format, ...)
+			const char *function_name, const char *module_name,
+			u32 component_id, const char *format, ...)
 {
 	va_list args;

@@ -261,7 +261,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_debug_print_r
  ******************************************************************************/
 void
 acpi_ut_trace(u32 line_number,
-	      const char *function_name, char *module_name, u32 component_id)
+	      const char *function_name, const char *module_name, u32 component_id)
 {
 
 	acpi_gbl_nesting_level++;

@@ -293,7 +293,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_trace)
 void
 acpi_ut_trace_ptr(u32 line_number,
 		  const char *function_name,
-		  char *module_name, u32 component_id, void *pointer)
+		  const char *module_name, u32 component_id, void *pointer)
 {
 	acpi_gbl_nesting_level++;
 	acpi_ut_track_stack_ptr();

@@ -324,7 +324,7 @@ acpi_ut_trace_ptr(u32 line_number,
 void
 acpi_ut_trace_str(u32 line_number,
 		  const char *function_name,
-		  char *module_name, u32 component_id, char *string)
+		  const char *module_name, u32 component_id, const char *string)
 {
 
 	acpi_gbl_nesting_level++;

@@ -356,7 +356,7 @@ acpi_ut_trace_str(u32 line_number,
 void
 acpi_ut_trace_u32(u32 line_number,
 		  const char *function_name,
-		  char *module_name, u32 component_id, u32 integer)
+		  const char *module_name, u32 component_id, u32 integer)
 {
 
 	acpi_gbl_nesting_level++;

@@ -385,8 +385,8 @@ acpi_ut_trace_u32(u32 line_number,
  ******************************************************************************/
 
 void
-acpi_ut_exit(u32 line_number,
-	     const char *function_name, char *module_name, u32 component_id)
+acpi_ut_exit(u32 line_number, const char *function_name,
+	     const char *module_name, u32 component_id)
 {
 
 	acpi_ut_debug_print(ACPI_LV_FUNCTIONS,

@@ -416,8 +416,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_exit)
  ******************************************************************************/
 void
 acpi_ut_status_exit(u32 line_number,
-		    const char *function_name,
-		    char *module_name, u32 component_id, acpi_status status)
+		    const char *function_name, const char *module_name,
+		    u32 component_id, acpi_status status)
 {
 
 	if (ACPI_SUCCESS(status)) {

@@ -457,8 +457,8 @@ ACPI_EXPORT_SYMBOL(acpi_ut_status_exit)
  ******************************************************************************/
 void
 acpi_ut_value_exit(u32 line_number,
-		   const char *function_name,
-		   char *module_name, u32 component_id, acpi_integer value)
+		   const char *function_name, const char *module_name,
+		   u32 component_id, acpi_integer value)
 {
 
 	acpi_ut_debug_print(ACPI_LV_FUNCTIONS,

@@ -490,7 +490,7 @@ ACPI_EXPORT_SYMBOL(acpi_ut_value_exit)
 void
 acpi_ut_ptr_exit(u32 line_number,
 		 const char *function_name,
-		 char *module_name, u32 component_id, u8 * ptr)
+		 const char *module_name, u32 component_id, u8 * ptr)
 {
 
 	acpi_ut_debug_print(ACPI_LV_FUNCTIONS,

drivers/acpi/utilities/utmisc.c +6 -5

@@ -1024,7 +1024,7 @@ acpi_ut_walk_package_tree(union acpi_ope
  ******************************************************************************/
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_error(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_error(const char *module_name, u32 line_number, const char *format, ...)
 {
 	va_list args;

@@ -1036,8 +1036,8 @@ acpi_ut_error(char *module_name, u32 lin
 }
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_exception(char *module_name,
-		  u32 line_number, acpi_status status, char *format, ...)
+acpi_ut_exception(const char *module_name,
+		  u32 line_number, acpi_status status, const char *format, ...)
 {
 	va_list args;

@@ -1052,7 +1052,8 @@ acpi_ut_exception(char *module_name,
 EXPORT_SYMBOL(acpi_ut_exception);
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_warning(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_warning(const char *module_name,
+		u32 line_number, const char *format, ...)
 {
 	va_list args;

@@ -1064,7 +1065,7 @@ acpi_ut_warning(char *module_name, u32 l
 }
 
 void ACPI_INTERNAL_VAR_XFACE
-acpi_ut_info(char *module_name, u32 line_number, char *format, ...)
+acpi_ut_info(const char *module_name, u32 line_number, const char *format, ...)
 {
 	va_list args;

drivers/acpi/utilities/utobject.c +2 -2

@@ -83,7 +83,7 @@ acpi_ut_get_element_length(u8 object_typ
  *
  ******************************************************************************/
 
-union acpi_operand_object *acpi_ut_create_internal_object_dbg(char *module_name,
+union acpi_operand_object *acpi_ut_create_internal_object_dbg(const char *module_name,
 							      u32 line_number,
 							      u32 component_id,
 							      acpi_object_type

@@ -346,7 +346,7 @@ u8 acpi_ut_valid_internal_object(void *o
  *
  ******************************************************************************/
 
-void *acpi_ut_allocate_object_desc_dbg(char *module_name,
+void *acpi_ut_allocate_object_desc_dbg(const char *module_name,
 				       u32 line_number, u32 component_id)
 {
 	union acpi_operand_object *object;

include/acpi/acinterp.h +3 -2

@@ -362,9 +362,10 @@ void acpi_ex_dump_operand(union acpi_ope
 void
 acpi_ex_dump_operands(union acpi_operand_object **operands,
 		      acpi_interpreter_mode interpreter_mode,
-		      char *ident,
+		      const char *ident,
 		      u32 num_levels,
-		      char *note, char *module_name, u32 line_number);
+		      const char *note, const char *module_name,
+		      u32 line_number);
 
 #ifdef	ACPI_FUTURE_USAGE
 void

include/acpi/aclocal.h +2 -2

@@ -282,8 +282,8 @@ struct acpi_predefined_names {
 /* Info structure used to convert external<->internal namestrings */
 
 struct acpi_namestring_info {
-	char *external_name;
-	char *next_external_char;
+	const char *external_name;
+	const char *next_external_char;
 	char *internal_name;
 	u32 length;
 	u32 num_segments;

include/acpi/acmacros.h +3 -4

@@ -413,7 +413,7 @@
  * error messages. The __FILE__ macro is not very useful for this, because it
  * often includes the entire pathname to the module
  */
-#define ACPI_MODULE_NAME(name)          static char ACPI_UNUSED_VAR *_acpi_module_name = name;
+#define ACPI_MODULE_NAME(name)          static const char ACPI_UNUSED_VAR _acpi_module_name[] = name;
 #else
 #define ACPI_MODULE_NAME(name)
 #endif

@@ -466,8 +466,7 @@
 /*
  * If ACPI_GET_FUNCTION_NAME was not defined in the compiler-dependent header,
  * define it now. This is the case where there the compiler does not support
- * a __FUNCTION__ macro or equivalent. We save the function name on the
- * local stack.
+ * a __FUNCTION__ macro or equivalent.
  */
 #ifndef ACPI_GET_FUNCTION_NAME
 #define ACPI_GET_FUNCTION_NAME          _acpi_function_name

@@ -478,7 +477,7 @@
  * Note: (const char) is used to be compatible with the debug interfaces
  * and macros such as __FUNCTION__.
  */
-#define ACPI_FUNCTION_NAME(name)        const char *_acpi_function_name = #name;
+#define ACPI_FUNCTION_NAME(name)        static const char _acpi_function_name[] = #name;
 
 #else
 /* Compiler supports __FUNCTION__ (or equivalent) -- Ignore this macro */

include/acpi/acnamesp.h +10 -9

@@ -200,7 +200,7 @@ acpi_ns_pattern_match(struct acpi_namesp
 
 acpi_status
 acpi_ns_get_node(struct acpi_namespace_node *prefix_node,
-		 char *external_pathname,
+		 const char *external_pathname,
 		 u32 flags, struct acpi_namespace_node **out_node);
 
 acpi_size acpi_ns_get_pathname_length(struct acpi_namespace_node *node);

@@ -264,28 +264,29 @@ acpi_object_type acpi_ns_get_type(struct
 u32 acpi_ns_local(acpi_object_type type);
 
 void
-acpi_ns_report_error(char *module_name,
+acpi_ns_report_error(const char *module_name,
 		     u32 line_number,
-		     char *internal_name, acpi_status lookup_status);
+		     const char *internal_name, acpi_status lookup_status);
 
 void
-acpi_ns_report_method_error(char *module_name,
+acpi_ns_report_method_error(const char *module_name,
 			    u32 line_number,
-			    char *message,
+			    const char *message,
 			    struct acpi_namespace_node *node,
-			    char *path, acpi_status lookup_status);
+			    const char *path, acpi_status lookup_status);
 
-void acpi_ns_print_node_pathname(struct acpi_namespace_node *node, char *msg);
+void acpi_ns_print_node_pathname(struct acpi_namespace_node *node,
+				 const char *msg);
 
 acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info);
 
 void acpi_ns_get_internal_name_length(struct acpi_namestring_info *info);
 
-acpi_status acpi_ns_internalize_name(char *dotted_name, char **converted_name);
+acpi_status acpi_ns_internalize_name(const char *dotted_name, char **converted_name);
 
 acpi_status
 acpi_ns_externalize_name(u32 internal_name_length,
-			 char *internal_name,
+			 const char *internal_name,
 			 u32 * converted_name_length, char **converted_name);
 
 struct acpi_namespace_node *acpi_ns_map_handle_to_node(acpi_handle handle);

include/acpi/acutils.h +23 ~~-28~~

121 lines not on this page · raw message