ACPICA: Reformat comments, no functional changes (9f15fc66) · Commits · e / devices / android_kernel_teracube_2e

drivers/acpi/events/evevent.c

+7 −7

Original line number	Diff line number	Diff line
		@@ -72,8 +72,8 @@ acpi_status acpi_ev_initialize_events(void)

		/*
		* Initialize the Fixed and General Purpose Events. This is done prior to
		* enabling SCIs to prevent interrupts from occurring before the handlers are
		* installed.
		* enabling SCIs to prevent interrupts from occurring before the handlers
		* are installed.
		*/
		status = acpi_ev_fixed_event_initialize();
		if (ACPI_FAILURE(status)) {
		@@ -192,8 +192,8 @@ static acpi_status acpi_ev_fixed_event_initialize(void)
		acpi_status status;

		/*
		* Initialize the structure that keeps track of fixed event handlers
		* and enable the fixed events.
		* Initialize the structure that keeps track of fixed event handlers and
		* enable the fixed events.
		*/
		for (i = 0; i < ACPI_NUM_FIXED_EVENTS; i++) {
		acpi_gbl_fixed_event_handlers[i].handler = NULL;
		@@ -291,8 +291,8 @@ static u32 acpi_ev_fixed_event_dispatch(u32 event)
		status_register_id, 1);

		/*
		* Make sure we've got a handler. If not, report an error.
		* The event is disabled to prevent further interrupts.
		* Make sure we've got a handler. If not, report an error. The event is
		* disabled to prevent further interrupts.
		*/
		if (NULL == acpi_gbl_fixed_event_handlers[event].handler) {
		(void)acpi_set_register(acpi_gbl_fixed_event_info[event].

drivers/acpi/events/evgpe.c

+18 −18

Original line number	Diff line number	Diff line
		@@ -400,8 +400,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)

		/*
		* We need to obtain the GPE lock for both the data structs and registers
		* Note: Not necessary to obtain the hardware lock, since the GPE registers
		* are owned by the gpe_lock.
		* Note: Not necessary to obtain the hardware lock, since the GPE
		* registers are owned by the gpe_lock.
		*/
		flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock);

		@@ -410,9 +410,8 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list)
		gpe_block = gpe_xrupt_list->gpe_block_list_head;
		while (gpe_block) {
		/*
		* Read all of the 8-bit GPE status and enable registers
		* in this GPE block, saving all of them.
		* Find all currently active GP events.
		* Read all of the 8-bit GPE status and enable registers in this GPE
		* block, saving all of them. Find all currently active GP events.
		*/
		for (i = 0; i < gpe_block->register_count; i++) {

		@@ -527,8 +526,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
		(void)acpi_ev_enable_gpe(gpe_event_info, FALSE);

		/*
		* Take a snapshot of the GPE info for this level - we copy the
		* info to prevent a race condition with remove_handler/remove_block.
		* Take a snapshot of the GPE info for this level - we copy the info to
		* prevent a race condition with remove_handler/remove_block.
		*/
		ACPI_MEMCPY(&local_gpe_event_info, gpe_event_info,
		sizeof(struct acpi_gpe_event_info));
		@@ -539,8 +538,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
		}

		/*
		* Must check for control method type dispatch one more
		* time to avoid race with ev_gpe_install_handler
		* Must check for control method type dispatch one more time to avoid a
		* race with ev_gpe_install_handler
		*/
		if ((local_gpe_event_info.flags & ACPI_GPE_DISPATCH_MASK) ==
		ACPI_GPE_DISPATCH_METHOD) {
		@@ -584,8 +583,8 @@ static void acpi_ev_asynch_enable_gpe(void *context)
		if ((gpe_event_info->flags & ACPI_GPE_XRUPT_TYPE_MASK) ==
		ACPI_GPE_LEVEL_TRIGGERED) {
		/*
		* GPE is level-triggered, we clear the GPE status bit after
		* handling the event.
		* GPE is level-triggered, we clear the GPE status bit after handling
		* the event.
		*/
		status = acpi_hw_clear_gpe(gpe_event_info);
		if (ACPI_FAILURE(status)) {
		@@ -650,7 +649,8 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)

		/*
		* Invoke the installed handler (at interrupt level)
		* Ignore return status for now. TBD: leave GPE disabled on error?
		* Ignore return status for now.
		* TBD: leave GPE disabled on error?
		*/
		(void)gpe_event_info->dispatch.handler->address(gpe_event_info->
		dispatch.
		@@ -708,7 +708,7 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number)
		gpe_number));

		/*
		* Disable the GPE. The GPE will remain disabled until the ACPI
		* Disable the GPE. The GPE will remain disabled until the ACPICA
		* Core Subsystem is restarted, or a handler is installed.
		*/
		status = acpi_ev_disable_gpe(gpe_event_info);

drivers/acpi/events/evgpeblk.c

+20 −18

Original line number	Diff line number	Diff line
		@@ -309,17 +309,17 @@ acpi_ev_save_method_info(acpi_handle obj_handle,
		(gpe_block->block_base_number +
		(gpe_block->register_count * 8)))) {
		/*
		* Not valid for this GPE block, just ignore it
		* However, it may be valid for a different GPE block, since GPE0 and GPE1
		* methods both appear under \_GPE.
		* Not valid for this GPE block, just ignore it. However, it may be
		* valid for a different GPE block, since GPE0 and GPE1 methods both
		* appear under \_GPE.
		*/
		return_ACPI_STATUS(AE_OK);
		}

		/*
		* Now we can add this information to the gpe_event_info block
		* for use during dispatch of this GPE. Default type is RUNTIME, although
		* this may change when the _PRW methods are executed later.
		* Now we can add this information to the gpe_event_info block for use
		* during dispatch of this GPE. Default type is RUNTIME, although this may
		* change when the _PRW methods are executed later.
		*/
		gpe_event_info =
		&gpe_block->event_info[gpe_number - gpe_block->block_base_number];
		@@ -394,8 +394,8 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
		gpe_block = gpe_info->gpe_block;

		/*
		* The _PRW object must return a package, we are only interested
		* in the first element
		* The _PRW object must return a package, we are only interested in the
		* first element
		*/
		obj_desc = pkg_desc->package.elements[0];

		@@ -434,7 +434,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
		/*
		* Is this GPE within this block?
		*
		* TRUE iff these conditions are true:
		* TRUE if and only if these conditions are true:
		* 1) The GPE devices match.
		* 2) The GPE index(number) is within the range of the Gpe Block
		* associated with the GPE device.
		@@ -457,6 +457,7 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
		if (ACPI_FAILURE(status)) {
		goto cleanup;
		}

		status =
		acpi_ev_update_gpe_enable_masks(gpe_event_info,
		ACPI_GPE_DISABLE);
		@@ -476,9 +477,9 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle,
		* RETURN: A GPE interrupt block
		*
		* DESCRIPTION: Get or Create a GPE interrupt block. There is one interrupt
		* block per unique interrupt level used for GPEs.
		* Should be called only when the GPE lists are semaphore locked
		* and not subject to change.
		* block per unique interrupt level used for GPEs. Should be
		* called only when the GPE lists are semaphore locked and not
		* subject to change.
		*
		******************************************************************************/

		@@ -609,7 +610,8 @@ acpi_ev_delete_gpe_xrupt(struct acpi_gpe_xrupt_info *gpe_xrupt)
		* FUNCTION: acpi_ev_install_gpe_block
		*
		* PARAMETERS: gpe_block - New GPE block
		* interrupt_number - Xrupt to be associated with this GPE block
		* interrupt_number - Xrupt to be associated with this
		* GPE block
		*
		* RETURN: Status
		*
		@@ -786,9 +788,9 @@ acpi_ev_create_gpe_info_blocks(struct acpi_gpe_block_info *gpe_block)

		/*
		* Initialize the GPE Register and Event structures. A goal of these
		* tables is to hide the fact that there are two separate GPE register sets
		* in a given GPE hardware block, the status registers occupy the first half,
		* and the enable registers occupy the second half.
		* tables is to hide the fact that there are two separate GPE register
		* sets in a given GPE hardware block, the status registers occupy the
		* first half, and the enable registers occupy the second half.
		*/
		this_register = gpe_register_info;
		this_event = gpe_event_info;

drivers/acpi/events/evmisc.c

+14 −15

Original line number	Diff line number	Diff line
		@@ -148,7 +148,9 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
		break;

		default:

		/* All other types are not supported */

		return (AE_TYPE);
		}
		}
		@@ -189,9 +191,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node,
		acpi_ut_delete_generic_state(notify_info);
		}
		} else {
		/*
		* There is no notify handler (per-device or system) for this device.
		*/
		/* There is no notify handler (per-device or system) for this device */

		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"No notify handler for Notify (%4.4s, %X) node %p\n",
		acpi_ut_get_node_name(node), notify_value,
		@@ -225,9 +226,8 @@ static void ACPI_SYSTEM_XFACE acpi_ev_notify_dispatch(void *context)
		ACPI_FUNCTION_ENTRY();

		/*
		* We will invoke a global notify handler if installed.
		* This is done _before_ we invoke the per-device handler attached
		* to the device.
		* We will invoke a global notify handler if installed. This is done
		* _before_ we invoke the per-device handler attached to the device.
		*/
		if (notify_info->notify.value <= ACPI_MAX_SYS_NOTIFY) {

		@@ -339,11 +339,10 @@ acpi_status acpi_ev_init_global_lock_handler(void)
		NULL);

		/*
		* If the global lock does not exist on this platform, the attempt
		* to enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick)
		* Map to AE_OK, but mark global lock as not present.
		* Any attempt to actually use the global lock will be flagged
		* with an error.
		* If the global lock does not exist on this platform, the attempt to
		* enable GBL_STATUS will fail (the GBL_ENABLE bit will not stick).
		* Map to AE_OK, but mark global lock as not present. Any attempt to
		* actually use the global lock will be flagged with an error.
		*/
		if (status == AE_NO_HARDWARE_RESPONSE) {
		ACPI_ERROR((AE_INFO,
		@@ -452,8 +451,8 @@ acpi_status acpi_ev_acquire_global_lock(u16 timeout)
		}

		/*
		* Make sure that a global lock actually exists. If not, just treat
		* the lock as a standard mutex.
		* Make sure that a global lock actually exists. If not, just treat the
		* lock as a standard mutex.
		*/
		if (!acpi_gbl_global_lock_present) {
		acpi_gbl_global_lock_acquired = TRUE;
		@@ -572,8 +571,8 @@ void acpi_ev_terminate(void)

		if (acpi_gbl_events_initialized) {
		/*
		* Disable all event-related functionality.
		* In all cases, on error, print a message but obviously we don't abort.
		* Disable all event-related functionality. In all cases, on error,
		* print a message but obviously we don't abort.
		*/

		/* Disable all fixed events */

drivers/acpi/events/evregion.c

+64 −69

Original line number	Diff line number	Diff line
		@@ -48,16 +48,8 @@

		#define _COMPONENT ACPI_EVENTS
		ACPI_MODULE_NAME("evregion")
		#define ACPI_NUM_DEFAULT_SPACES 4
		static u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
		ACPI_ADR_SPACE_SYSTEM_MEMORY,
		ACPI_ADR_SPACE_SYSTEM_IO,
		ACPI_ADR_SPACE_PCI_CONFIG,
		ACPI_ADR_SPACE_DATA_TABLE
		};

		/* Local prototypes */

		static acpi_status
		acpi_ev_reg_run(acpi_handle obj_handle,
		u32 level, void context, void *return_value);
		@@ -66,6 +58,17 @@ static acpi_status
		acpi_ev_install_handler(acpi_handle obj_handle,
		u32 level, void context, void *return_value);

		/* These are the address spaces that will get default handlers */

		#define ACPI_NUM_DEFAULT_SPACES 4

		static u8 acpi_gbl_default_address_spaces[ACPI_NUM_DEFAULT_SPACES] = {
		ACPI_ADR_SPACE_SYSTEM_MEMORY,
		ACPI_ADR_SPACE_SYSTEM_IO,
		ACPI_ADR_SPACE_PCI_CONFIG,
		ACPI_ADR_SPACE_DATA_TABLE
		};

		/*******************************************************************************
		*
		* FUNCTION: acpi_ev_install_region_handlers
		@@ -91,18 +94,19 @@ acpi_status acpi_ev_install_region_handlers(void)
		}

		/*
		* All address spaces (PCI Config, EC, SMBus) are scope dependent
		* and registration must occur for a specific device.
		* All address spaces (PCI Config, EC, SMBus) are scope dependent and
		* registration must occur for a specific device.
		*
		* In the case of the system memory and IO address spaces there is currently
		* no device associated with the address space. For these we use the root.
		* In the case of the system memory and IO address spaces there is
		* currently no device associated with the address space. For these we
		* use the root.
		*
		* We install the default PCI config space handler at the root so
		* that this space is immediately available even though the we have
		* not enumerated all the PCI Root Buses yet. This is to conform
		* to the ACPI specification which states that the PCI config
		* space must be always available -- even though we are nowhere
		* near ready to find the PCI root buses at this point.
		* We install the default PCI config space handler at the root so that
		* this space is immediately available even though the we have not
		* enumerated all the PCI Root Buses yet. This is to conform to the ACPI
		* specification which states that the PCI config space must be always
		* available -- even though we are nowhere near ready to find the PCI root
		* buses at this point.
		*
		* NOTE: We ignore AE_ALREADY_EXISTS because this means that a handler
		* has already been installed (via acpi_install_address_space_handler).
		@@ -160,12 +164,11 @@ acpi_status acpi_ev_initialize_op_regions(void)
		return_ACPI_STATUS(status);
		}

		/*
		* Run the _REG methods for op_regions in each default address space
		*/
		for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
		/* Run the _REG methods for op_regions in each default address space */

		/* TBD: Make sure handler is the DEFAULT handler, otherwise
		for (i = 0; i < ACPI_NUM_DEFAULT_SPACES; i++) {
		/*
		* TBD: Make sure handler is the DEFAULT handler, otherwise
		* _REG will have already been run.
		*/
		status = acpi_ev_execute_reg_methods(acpi_gbl_root_node,
		@@ -318,13 +321,13 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
		}

		/*
		* It may be the case that the region has never been initialized
		* It may be the case that the region has never been initialized.
		* Some types of regions require special init code
		*/
		if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
		/*
		* This region has not been initialized yet, do it
		*/

		/* This region has not been initialized yet, do it */

		region_setup = handler_desc->address_space.setup;
		if (!region_setup) {

		@@ -339,9 +342,9 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
		}

		/*
		* We must exit the interpreter because the region
		* setup will potentially execute control methods
		* (e.g., _REG method for this region)
		* We must exit the interpreter because the region setup will
		* potentially execute control methods (for example, the _REG method
		* for this region)
		*/
		acpi_ex_exit_interpreter();

		@@ -364,9 +367,8 @@ acpi_ev_address_space_dispatch(union acpi_operand_object *region_obj,
		return_ACPI_STATUS(status);
		}

		/*
		* Region initialization may have been completed by region_setup
		*/
		/* Region initialization may have been completed by region_setup */

		if (!(region_obj->region.flags & AOPOBJ_SETUP_COMPLETE)) {
		region_obj->region.flags \|= AOPOBJ_SETUP_COMPLETE;

		@@ -521,8 +523,8 @@ acpi_ev_detach_region(union acpi_operand_object *region_obj,
		}

		/*
		* If the region has been activated, call the setup handler
		* with the deactivate notification
		* If the region has been activated, call the setup handler with
		* the deactivate notification
		*/
		if (region_obj->region.flags & AOPOBJ_SETUP_COMPLETE) {
		region_setup = handler_obj->address_space.setup;
		@@ -668,8 +670,8 @@ acpi_ev_install_handler(acpi_handle obj_handle,
		}

		/*
		* We only care about regions.and objects
		* that are allowed to have address space handlers
		* We only care about regions and objects that are allowed to have
		* address space handlers
		*/
		if ((node->type != ACPI_TYPE_DEVICE) &&
		(node->type != ACPI_TYPE_REGION) && (node != acpi_gbl_root_node)) {
		@@ -723,9 +725,8 @@ acpi_ev_install_handler(acpi_handle obj_handle,
		}

		/*
		* As long as the device didn't have a handler for this
		* space we don't care about it. We just ignore it and
		* proceed.
		* As long as the device didn't have a handler for this space we
		* don't care about it. We just ignore it and proceed.
		*/
		return (AE_OK);
		}
		@@ -733,16 +734,14 @@ acpi_ev_install_handler(acpi_handle obj_handle,
		/* Object is a Region */

		if (obj_desc->region.space_id != handler_obj->address_space.space_id) {
		/*
		* This region is for a different address space
		* -- just ignore it
		*/

		/* This region is for a different address space, just ignore it */

		return (AE_OK);
		}

		/*
		* Now we have a region and it is for the handler's address
		* space type.
		* Now we have a region and it is for the handler's address space type.
		*
		* First disconnect region for any previous handler (if any)
		*/
		@@ -786,9 +785,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
		ACPI_FUNCTION_TRACE(ev_install_space_handler);

		/*
		* This registration is valid for only the types below
		* and the root. This is where the default handlers
		* get placed.
		* This registration is valid for only the types below and the root. This
		* is where the default handlers get placed.
		*/
		if ((node->type != ACPI_TYPE_DEVICE) &&
		(node->type != ACPI_TYPE_PROCESSOR) &&
		@@ -848,8 +846,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
		obj_desc = acpi_ns_get_attached_object(node);
		if (obj_desc) {
		/*
		* The attached device object already exists.
		* Make sure the handler is not already installed.
		* The attached device object already exists. Make sure the handler
		* is not already installed.
		*/
		handler_obj = obj_desc->device.handler;

		@@ -864,8 +862,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
		handler) {
		/*
		* It is (relatively) OK to attempt to install the SAME
		* handler twice. This can easily happen
		* with PCI_Config space.
		* handler twice. This can easily happen with the
		* PCI_Config space.
		*/
		status = AE_SAME_HANDLER;
		goto unlock_and_exit;
		@@ -925,9 +923,8 @@ acpi_ev_install_space_handler(struct acpi_namespace_node * node,
		/*
		* Install the handler
		*
		* At this point there is no existing handler.
		* Just allocate the object for the handler and link it
		* into the list.
		* At this point there is no existing handler. Just allocate the object
		* for the handler and link it into the list.
		*/
		handler_obj =
		acpi_ut_create_internal_object(ACPI_TYPE_LOCAL_ADDRESS_HANDLER);
		@@ -1000,11 +997,10 @@ acpi_ev_execute_reg_methods(struct acpi_namespace_node *node,
		ACPI_FUNCTION_TRACE(ev_execute_reg_methods);

		/*
		* Run all _REG methods for all Operation Regions for this
		* space ID. This is a separate walk in order to handle any
		* interdependencies between regions and _REG methods. (i.e. handlers
		* must be installed for all regions of this Space ID before we
		* can run any _REG methods)
		* Run all _REG methods for all Operation Regions for this space ID. This
		* is a separate walk in order to handle any interdependencies between
		* regions and _REG methods. (i.e. handlers must be installed for all
		* regions of this Space ID before we can run any _REG methods)
		*/
		status = acpi_ns_walk_namespace(ACPI_TYPE_ANY, node, ACPI_UINT32_MAX,
		ACPI_NS_WALK_UNLOCK, acpi_ev_reg_run,
		@@ -1042,8 +1038,8 @@ acpi_ev_reg_run(acpi_handle obj_handle,
		}

		/*
		* We only care about regions.and objects
		* that are allowed to have address space handlers
		* We only care about regions.and objects that are allowed to have address
		* space handlers
		*/
		if ((node->type != ACPI_TYPE_REGION) && (node != acpi_gbl_root_node)) {
		return (AE_OK);
		@@ -1062,10 +1058,9 @@ acpi_ev_reg_run(acpi_handle obj_handle,
		/* Object is a Region */

		if (obj_desc->region.space_id != space_id) {
		/*
		* This region is for a different address space
		* -- just ignore it
		*/

		/* This region is for a different address space, just ignore it */

		return (AE_OK);
		}