diff options
Diffstat (limited to 'drivers/acpi/dispatcher/dswscope.c')
| -rw-r--r-- | drivers/acpi/dispatcher/dswscope.c | 139 | 
1 files changed, 61 insertions, 78 deletions
diff --git a/drivers/acpi/dispatcher/dswscope.c b/drivers/acpi/dispatcher/dswscope.c index 21f4548ff32..defe956ef75 100644 --- a/drivers/acpi/dispatcher/dswscope.c +++ b/drivers/acpi/dispatcher/dswscope.c @@ -41,14 +41,11 @@   * POSSIBILITY OF SUCH DAMAGES.   */ -  #include <acpi/acpi.h>  #include <acpi/acdispat.h> -  #define _COMPONENT          ACPI_DISPATCHER -	 ACPI_MODULE_NAME    ("dswscope") - +ACPI_MODULE_NAME("dswscope")  /****************************************************************************   * @@ -62,15 +59,11 @@   *              root scope object (which remains at the stack top.)   *   ***************************************************************************/ - -void -acpi_ds_scope_stack_clear ( -	struct acpi_walk_state          *walk_state) +void acpi_ds_scope_stack_clear(struct acpi_walk_state *walk_state)  { -	union acpi_generic_state        *scope_info; - -	ACPI_FUNCTION_NAME ("ds_scope_stack_clear"); +	union acpi_generic_state *scope_info; +	ACPI_FUNCTION_NAME("ds_scope_stack_clear");  	while (walk_state->scope_info) {  		/* Pop a scope off the stack */ @@ -78,14 +71,14 @@ acpi_ds_scope_stack_clear (  		scope_info = walk_state->scope_info;  		walk_state->scope_info = scope_info->scope.next; -		ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, -			"Popped object type (%s)\n", -			acpi_ut_get_type_name (scope_info->common.value))); -		acpi_ut_delete_generic_state (scope_info); +		ACPI_DEBUG_PRINT((ACPI_DB_EXEC, +				  "Popped object type (%s)\n", +				  acpi_ut_get_type_name(scope_info->common. +							value))); +		acpi_ut_delete_generic_state(scope_info);  	}  } -  /****************************************************************************   *   * FUNCTION:    acpi_ds_scope_stack_push @@ -102,74 +95,70 @@ acpi_ds_scope_stack_clear (   ***************************************************************************/  acpi_status -acpi_ds_scope_stack_push ( -	struct acpi_namespace_node      *node, -	acpi_object_type                type, -	struct acpi_walk_state          *walk_state) +acpi_ds_scope_stack_push(struct acpi_namespace_node *node, +			 acpi_object_type type, +			 struct acpi_walk_state *walk_state)  { -	union acpi_generic_state        *scope_info; -	union acpi_generic_state        *old_scope_info; - - -	ACPI_FUNCTION_TRACE ("ds_scope_stack_push"); +	union acpi_generic_state *scope_info; +	union acpi_generic_state *old_scope_info; +	ACPI_FUNCTION_TRACE("ds_scope_stack_push");  	if (!node) {  		/* Invalid scope   */ -		ACPI_REPORT_ERROR (("ds_scope_stack_push: null scope passed\n")); -		return_ACPI_STATUS (AE_BAD_PARAMETER); +		ACPI_REPORT_ERROR(("ds_scope_stack_push: null scope passed\n")); +		return_ACPI_STATUS(AE_BAD_PARAMETER);  	}  	/* Make sure object type is valid */ -	if (!acpi_ut_valid_object_type (type)) { -		ACPI_REPORT_WARNING (( -			"ds_scope_stack_push: Invalid object type: 0x%X\n", type)); +	if (!acpi_ut_valid_object_type(type)) { +		ACPI_REPORT_WARNING(("ds_scope_stack_push: Invalid object type: 0x%X\n", type));  	}  	/* Allocate a new scope object */ -	scope_info = acpi_ut_create_generic_state (); +	scope_info = acpi_ut_create_generic_state();  	if (!scope_info) { -		return_ACPI_STATUS (AE_NO_MEMORY); +		return_ACPI_STATUS(AE_NO_MEMORY);  	}  	/* Init new scope object */  	scope_info->common.data_type = ACPI_DESC_TYPE_STATE_WSCOPE; -	scope_info->scope.node      = node; -	scope_info->common.value    = (u16) type; +	scope_info->scope.node = node; +	scope_info->common.value = (u16) type;  	walk_state->scope_depth++; -	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, -		"[%.2d] Pushed scope ", (u32) walk_state->scope_depth)); +	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, +			  "[%.2d] Pushed scope ", +			  (u32) walk_state->scope_depth));  	old_scope_info = walk_state->scope_info;  	if (old_scope_info) { -		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, -			"[%4.4s] (%s)", -			acpi_ut_get_node_name (old_scope_info->scope.node), -			acpi_ut_get_type_name (old_scope_info->common.value))); -	} -	else { -		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, -			"[\\___] (%s)", "ROOT")); +		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, +				      "[%4.4s] (%s)", +				      acpi_ut_get_node_name(old_scope_info-> +							    scope.node), +				      acpi_ut_get_type_name(old_scope_info-> +							    common.value))); +	} else { +		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "[\\___] (%s)", "ROOT"));  	} -	ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, -		", New scope -> [%4.4s] (%s)\n", -		acpi_ut_get_node_name (scope_info->scope.node), -		acpi_ut_get_type_name (scope_info->common.value))); +	ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, +			      ", New scope -> [%4.4s] (%s)\n", +			      acpi_ut_get_node_name(scope_info->scope.node), +			      acpi_ut_get_type_name(scope_info->common.value)));  	/* Push new scope object onto stack */ -	acpi_ut_push_generic_state (&walk_state->scope_info, scope_info); -	return_ACPI_STATUS (AE_OK); +	acpi_ut_push_generic_state(&walk_state->scope_info, scope_info); +	return_ACPI_STATUS(AE_OK);  } -  /****************************************************************************   *   * FUNCTION:    acpi_ds_scope_stack_pop @@ -182,47 +171,41 @@ acpi_ds_scope_stack_push (   *   ***************************************************************************/ -acpi_status -acpi_ds_scope_stack_pop ( -	struct acpi_walk_state          *walk_state) +acpi_status acpi_ds_scope_stack_pop(struct acpi_walk_state *walk_state)  { -	union acpi_generic_state        *scope_info; -	union acpi_generic_state        *new_scope_info; - - -	ACPI_FUNCTION_TRACE ("ds_scope_stack_pop"); +	union acpi_generic_state *scope_info; +	union acpi_generic_state *new_scope_info; +	ACPI_FUNCTION_TRACE("ds_scope_stack_pop");  	/*  	 * Pop scope info object off the stack.  	 */ -	scope_info = acpi_ut_pop_generic_state (&walk_state->scope_info); +	scope_info = acpi_ut_pop_generic_state(&walk_state->scope_info);  	if (!scope_info) { -		return_ACPI_STATUS (AE_STACK_UNDERFLOW); +		return_ACPI_STATUS(AE_STACK_UNDERFLOW);  	}  	walk_state->scope_depth--; -	ACPI_DEBUG_PRINT ((ACPI_DB_EXEC, -		"[%.2d] Popped scope [%4.4s] (%s), New scope -> ", -		(u32) walk_state->scope_depth, -		acpi_ut_get_node_name (scope_info->scope.node), -		acpi_ut_get_type_name (scope_info->common.value))); +	ACPI_DEBUG_PRINT((ACPI_DB_EXEC, +			  "[%.2d] Popped scope [%4.4s] (%s), New scope -> ", +			  (u32) walk_state->scope_depth, +			  acpi_ut_get_node_name(scope_info->scope.node), +			  acpi_ut_get_type_name(scope_info->common.value)));  	new_scope_info = walk_state->scope_info;  	if (new_scope_info) { -		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, -			"[%4.4s] (%s)\n", -			acpi_ut_get_node_name (new_scope_info->scope.node), -			acpi_ut_get_type_name (new_scope_info->common.value))); -	} -	else { -		ACPI_DEBUG_PRINT_RAW ((ACPI_DB_EXEC, -			"[\\___] (ROOT)\n")); +		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, +				      "[%4.4s] (%s)\n", +				      acpi_ut_get_node_name(new_scope_info-> +							    scope.node), +				      acpi_ut_get_type_name(new_scope_info-> +							    common.value))); +	} else { +		ACPI_DEBUG_PRINT_RAW((ACPI_DB_EXEC, "[\\___] (ROOT)\n"));  	} -	acpi_ut_delete_generic_state (scope_info); -	return_ACPI_STATUS (AE_OK); +	acpi_ut_delete_generic_state(scope_info); +	return_ACPI_STATUS(AE_OK);  } - -  |