1 files changed, 21 insertions, 21 deletions

diff --git a/drivers/acpi/dispatcher/dswstate.c b/drivers/acpi/dispatcher/dswstate.c
index 4840eae47d34..82c1e219bf15 100644
--- a/drivers/acpi/dispatcher/dswstate.c
+++ b/drivers/acpi/dispatcher/dswstate.c
@@ -87,7 +87,7 @@ acpi_ds_result_remove(union acpi_operand_object **object,
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_remove");
+        ACPI_FUNCTION_NAME(ds_result_remove);
 
         state = walk_state->results;
         if (!state) {
@@ -150,7 +150,7 @@ acpi_ds_result_pop(union acpi_operand_object ** object,
         acpi_native_uint index;
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_pop");
+        ACPI_FUNCTION_NAME(ds_result_pop);
 
         state = walk_state->results;
         if (!state) {
@@ -212,7 +212,7 @@ acpi_ds_result_pop_from_bottom(union acpi_operand_object ** object,
         acpi_native_uint index;
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_pop_from_bottom");
+        ACPI_FUNCTION_NAME(ds_result_pop_from_bottom);
 
         state = walk_state->results;
         if (!state) {
@@ -277,7 +277,7 @@ acpi_ds_result_push(union acpi_operand_object * object,
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_push");
+        ACPI_FUNCTION_NAME(ds_result_push);
 
         state = walk_state->results;
         if (!state) {
@@ -330,7 +330,7 @@ acpi_status acpi_ds_result_stack_push(struct acpi_walk_state * walk_state)
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_stack_push");
+        ACPI_FUNCTION_NAME(ds_result_stack_push);
 
         state = acpi_ut_create_generic_state();
         if (!state) {
@@ -362,7 +362,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_stack_pop");
+        ACPI_FUNCTION_NAME(ds_result_stack_pop);
 
         /* Check for stack underflow */
 
@@ -375,7 +375,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
         state = acpi_ut_pop_generic_state(&walk_state->results);
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                          "Result=%p remaining_results=%X State=%p\n",
+                          "Result=%p RemainingResults=%X State=%p\n",
                           state, state->results.num_results, walk_state));
 
         acpi_ut_delete_generic_state(state);
@@ -399,7 +399,7 @@ acpi_status acpi_ds_result_stack_pop(struct acpi_walk_state * walk_state)
 acpi_status
 acpi_ds_obj_stack_push(void *object, struct acpi_walk_state * walk_state)
 {
-        ACPI_FUNCTION_NAME("ds_obj_stack_push");
+        ACPI_FUNCTION_NAME(ds_obj_stack_push);
 
         /* Check for stack overflow */
 
@@ -444,7 +444,7 @@ acpi_ds_obj_stack_pop(u32 pop_count, struct acpi_walk_state * walk_state)
 {
         u32 i;
 
-        ACPI_FUNCTION_NAME("ds_obj_stack_pop");
+        ACPI_FUNCTION_NAME(ds_obj_stack_pop);
 
         for (i = 0; i < pop_count; i++) {
 
@@ -491,7 +491,7 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
         u32 i;
         union acpi_operand_object *obj_desc;
 
-        ACPI_FUNCTION_NAME("ds_obj_stack_pop_and_delete");
+        ACPI_FUNCTION_NAME(ds_obj_stack_pop_and_delete);
 
         for (i = 0; i < pop_count; i++) {
 
@@ -539,13 +539,13 @@ acpi_ds_obj_stack_pop_and_delete(u32 pop_count,
 struct acpi_walk_state *acpi_ds_get_current_walk_state(struct acpi_thread_state
                                                        *thread)
 {
-        ACPI_FUNCTION_NAME("ds_get_current_walk_state");
+        ACPI_FUNCTION_NAME(ds_get_current_walk_state);
 
         if (!thread) {
                 return (NULL);
         }
 
-        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current walk_state %p\n",
+        ACPI_DEBUG_PRINT((ACPI_DB_PARSE, "Current WalkState %p\n",
                           thread->walk_state_list));
 
         return (thread->walk_state_list);
@@ -568,7 +568,7 @@ void
 acpi_ds_push_walk_state(struct acpi_walk_state *walk_state,
                         struct acpi_thread_state *thread)
 {
-        ACPI_FUNCTION_TRACE("ds_push_walk_state");
+        ACPI_FUNCTION_TRACE(ds_push_walk_state);
 
         walk_state->next = thread->walk_state_list;
         thread->walk_state_list = walk_state;
@@ -594,7 +594,7 @@ struct acpi_walk_state *acpi_ds_pop_walk_state(struct acpi_thread_state *thread)
 {
         struct acpi_walk_state *walk_state;
 
-        ACPI_FUNCTION_TRACE("ds_pop_walk_state");
+        ACPI_FUNCTION_TRACE(ds_pop_walk_state);
 
         walk_state = thread->walk_state_list;
 
@@ -641,7 +641,7 @@ struct acpi_walk_state *acpi_ds_create_walk_state(acpi_owner_id owner_id,
         struct acpi_walk_state *walk_state;
         acpi_status status;
 
-        ACPI_FUNCTION_TRACE("ds_create_walk_state");
+        ACPI_FUNCTION_TRACE(ds_create_walk_state);
 
         walk_state = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_walk_state));
         if (!walk_state) {
@@ -709,7 +709,7 @@ acpi_ds_init_aml_walk(struct acpi_walk_state *walk_state,
         struct acpi_parse_state *parser_state = &walk_state->parser_state;
         union acpi_parse_object *extra_op;
 
-        ACPI_FUNCTION_TRACE("ds_init_aml_walk");
+        ACPI_FUNCTION_TRACE(ds_init_aml_walk);
 
         walk_state->parser_state.aml =
             walk_state->parser_state.aml_start = aml_start;
@@ -813,7 +813,7 @@ void acpi_ds_delete_walk_state(struct acpi_walk_state *walk_state)
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_delete_walk_state", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ds_delete_walk_state, walk_state);
 
         if (!walk_state) {
                 return;
@@ -882,7 +882,7 @@ acpi_ds_result_insert(void *object,
 {
         union acpi_generic_state *state;
 
-        ACPI_FUNCTION_NAME("ds_result_insert");
+        ACPI_FUNCTION_NAME(ds_result_insert);
 
         state = walk_state->results;
         if (!state) {
@@ -940,7 +940,7 @@ acpi_status acpi_ds_obj_stack_delete_all(struct acpi_walk_state * walk_state)
 {
         u32 i;
 
-        ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_delete_all", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_delete_all, walk_state);
 
         /* The stack size is configurable, but fixed */
 
@@ -972,7 +972,7 @@ acpi_status
 acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
                              struct acpi_walk_state *walk_state)
 {
-        ACPI_FUNCTION_NAME("ds_obj_stack_pop_object");
+        ACPI_FUNCTION_NAME(ds_obj_stack_pop_object);
 
         /* Check for stack underflow */
 
@@ -1028,7 +1028,7 @@ acpi_ds_obj_stack_pop_object(union acpi_operand_object **object,
 void *acpi_ds_obj_stack_get_value(u32 index, struct acpi_walk_state *walk_state)
 {
 
-        ACPI_FUNCTION_TRACE_PTR("ds_obj_stack_get_value", walk_state);
+        ACPI_FUNCTION_TRACE_PTR(ds_obj_stack_get_value, walk_state);
 
         /* Can't do it if the stack is empty */