Commit d4913dc6 authored by Bob Moore's avatar Bob Moore Committed by Len Brown
Browse files

ACPICA: Formatting update - no functional changes 



Split long lines, update comments.

Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 768aaaf1

drivers/acpi/acpica/evgpe.c

+4 −3
Original line number Diff line number Diff line
@@ -88,10 +88,10 @@ acpi_ev_set_gpe_type(struct acpi_gpe_event_info *gpe_event_info, u8 type) 


	status = acpi_ev_disable_gpe(gpe_event_info);



	/* Type was validated above */

	/* Clear the type bits and insert the new Type */



	gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;	/* Clear type bits */

	gpe_event_info->flags |= type;	/* Insert type */

	gpe_event_info->flags &= ~ACPI_GPE_TYPE_MASK;

	gpe_event_info->flags |= type;

	return_ACPI_STATUS(status);

}
@@ -122,6 +122,7 @@ acpi_ev_update_gpe_enable_masks(struct acpi_gpe_event_info *gpe_event_info, 
	if (!gpe_register_info) {

		return_ACPI_STATUS(AE_NOT_EXIST);

	}



	register_bit = (u8)

	    (1 <<

	     (gpe_event_info->gpe_number - gpe_register_info->base_gpe_number));

drivers/acpi/acpica/evgpeblk.c

+31 −33
Original line number Diff line number Diff line
@@ -104,8 +104,8 @@ u8 acpi_ev_valid_gpe_event(struct acpi_gpe_event_info *gpe_event_info) 


		while (gpe_block) {

			if ((&gpe_block->event_info[0] <= gpe_event_info) &&

			    (&gpe_block->

			     event_info[((acpi_size) gpe_block->

			    (&gpe_block->event_info[((acpi_size)

						     gpe_block->

						     register_count) * 8] >

			     gpe_event_info)) {

				return (TRUE);
@@ -210,10 +210,9 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info, 
		/* Now look at the individual GPEs in this byte register */



		for (j = 0; j < ACPI_GPE_REGISTER_WIDTH; j++) {

			gpe_event_info =

			    &gpe_block->

			    event_info[((acpi_size) i *

					ACPI_GPE_REGISTER_WIDTH) + j];

			gpe_event_info = &gpe_block->event_info[((acpi_size) i *

								 ACPI_GPE_REGISTER_WIDTH)

								+ j];



			if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==

			    ACPI_GPE_DISPATCH_HANDLER) {
@@ -293,8 +292,8 @@ acpi_ev_save_method_info(acpi_handle obj_handle, 
		/* Unknown method type, just ignore it! */



		ACPI_DEBUG_PRINT((ACPI_DB_LOAD,

				  "Ignoring unknown GPE method type: %s (name not of form _Lxx or _Exx)",

				  name));

				  "Ignoring unknown GPE method type: %s "

				  "(name not of form _Lxx or _Exx)", name));

		return_ACPI_STATUS(AE_OK);

	}
@@ -306,16 +305,15 @@ acpi_ev_save_method_info(acpi_handle obj_handle, 
		/* Conversion failed; invalid method, just ignore it */



		ACPI_DEBUG_PRINT((ACPI_DB_LOAD,

				  "Could not extract GPE number from name: %s (name is not of form _Lxx or _Exx)",

				  name));

				  "Could not extract GPE number from name: %s "

				  "(name is not of form _Lxx or _Exx)", name));

		return_ACPI_STATUS(AE_OK);

	}



	/* Ensure that we have a valid GPE number for this GPE block */



	if ((gpe_number < gpe_block->block_base_number) ||

	    (gpe_number >=

	     (gpe_block->block_base_number +

	    (gpe_number >= (gpe_block->block_base_number +

			    (gpe_block->register_count * 8)))) {

		/*

		 * Not valid for this GPE block, just ignore it. However, it may be
@@ -423,8 +421,8 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle, 


		if ((obj_desc->package.count < 2) ||

		    ((obj_desc->package.elements[0])->common.type !=

		     ACPI_TYPE_LOCAL_REFERENCE)

		    || ((obj_desc->package.elements[1])->common.type !=

		     ACPI_TYPE_LOCAL_REFERENCE) ||

		    ((obj_desc->package.elements[1])->common.type !=

		     ACPI_TYPE_INTEGER)) {

			goto cleanup;

		}
@@ -450,11 +448,11 @@ acpi_ev_match_prw_and_gpe(acpi_handle obj_handle, 
	 */

	if ((gpe_device == target_gpe_device) &&

	    (gpe_number >= gpe_block->block_base_number) &&

	    (gpe_number <

	     gpe_block->block_base_number + (gpe_block->register_count * 8))) {

		gpe_event_info =

		    &gpe_block->event_info[gpe_number -

					   gpe_block->block_base_number];

	    (gpe_number < gpe_block->block_base_number +

	     (gpe_block->register_count * 8))) {

		gpe_event_info = &gpe_block->event_info[gpe_number -

							gpe_block->

							block_base_number];



		/* Mark GPE for WAKE-ONLY but WAKE_DISABLED */
@@ -1033,8 +1031,8 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, 
	 * 1) are "runtime" or "run/wake" GPEs, and

	 * 2) have a corresponding _Lxx or _Exx method

	 *

	 * Any other GPEs within this block must be enabled via the acpi_enable_gpe()

	 * external interface.

	 * Any other GPEs within this block must be enabled via the

	 * acpi_enable_gpe() external interface.

	 */

	wake_gpe_count = 0;

	gpe_enabled_count = 0;
@@ -1044,14 +1042,13 @@ acpi_ev_initialize_gpe_block(struct acpi_namespace_node *gpe_device, 


			/* Get the info block for this particular GPE */



			gpe_event_info =

			    &gpe_block->

			    event_info[((acpi_size) i *

					ACPI_GPE_REGISTER_WIDTH) + j];

			gpe_event_info = &gpe_block->event_info[((acpi_size) i *

								 ACPI_GPE_REGISTER_WIDTH)

								+ j];



			if (((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==

			     ACPI_GPE_DISPATCH_METHOD)

			    && (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {

			     ACPI_GPE_DISPATCH_METHOD) &&

			    (gpe_event_info->flags & ACPI_GPE_TYPE_RUNTIME)) {

				gpe_enabled_count++;

			}
@@ -1105,8 +1102,8 @@ acpi_status acpi_ev_gpe_initialize(void) 
	/*

	 * Initialize the GPE Block(s) defined in the FADT

	 *

	 * Why the GPE register block lengths are divided by 2:  From the ACPI Spec,

	 * section "General-Purpose Event Registers", we have:

	 * Why the GPE register block lengths are divided by 2:  From the ACPI

	 * Spec, section "General-Purpose Event Registers", we have:

	 *

	 * "Each register block contains two registers of equal length

	 *  GPEx_STS and GPEx_EN (where x is 0 or 1). The length of the
@@ -1163,7 +1160,8 @@ acpi_status acpi_ev_gpe_initialize(void) 
		if ((register_count0) &&

		    (gpe_number_max >= acpi_gbl_FADT.gpe1_base)) {

			ACPI_ERROR((AE_INFO,

				    "GPE0 block (GPE 0 to %d) overlaps the GPE1 block (GPE %d to %d) - Ignoring GPE1",

				    "GPE0 block (GPE 0 to %d) overlaps the GPE1 block "

				    "(GPE %d to %d) - Ignoring GPE1",

				    gpe_number_max, acpi_gbl_FADT.gpe1_base,

				    acpi_gbl_FADT.gpe1_base +

				    ((register_count1 *

drivers/acpi/acpica/evmisc.c

+6 −5
Original line number Diff line number Diff line
@@ -163,10 +163,10 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, 
	 * 2) Global device notify handler

	 * 3) Per-device notify handler

	 */

	if ((acpi_gbl_system_notify.handler

	     && (notify_value <= ACPI_MAX_SYS_NOTIFY))

	    || (acpi_gbl_device_notify.handler

		&& (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {

	if ((acpi_gbl_system_notify.handler &&

	     (notify_value <= ACPI_MAX_SYS_NOTIFY)) ||

	    (acpi_gbl_device_notify.handler &&

	     (notify_value > ACPI_MAX_SYS_NOTIFY)) || handler_obj) {

		notify_info = acpi_ut_create_generic_state();

		if (!notify_info) {

			return (AE_NO_MEMORY);
@@ -174,7 +174,8 @@ acpi_ev_queue_notify_request(struct acpi_namespace_node * node, 


		if (!handler_obj) {

			ACPI_DEBUG_PRINT((ACPI_DB_INFO,

					  "Executing system notify handler for Notify (%4.4s, %X) node %p\n",

					  "Executing system notify handler for Notify (%4.4s, %X) "

					  "node %p\n",

					  acpi_ut_get_node_name(node),

					  notify_value, node));

		}

drivers/acpi/acpica/evregion.c

+2 −1
Original line number Diff line number Diff line
@@ -703,7 +703,8 @@ acpi_ev_install_handler(acpi_handle obj_handle, 
			if (next_handler_obj->address_space.space_id ==

			    handler_obj->address_space.space_id) {

				ACPI_DEBUG_PRINT((ACPI_DB_OPREGION,

						  "Found handler for region [%s] in device %p(%p) handler %p\n",

						  "Found handler for region [%s] in device %p(%p) "

						  "handler %p\n",

						  acpi_ut_get_region_name

						  (handler_obj->address_space.

						   space_id), obj_desc,

drivers/acpi/acpica/evrgnini.c

+10 −12
Original line number Diff line number Diff line
@@ -241,7 +241,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, 
						status = AE_OK;

					} else {

						ACPI_EXCEPTION((AE_INFO, status,

								"Could not install PciConfig handler for Root Bridge %4.4s",

								"Could not install PciConfig handler "

								"for Root Bridge %4.4s",

								acpi_ut_get_node_name

								(pci_root_node)));

					}
@@ -293,9 +294,8 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, 
	 * Get the PCI device and function numbers from the _ADR object contained

	 * in the parent's scope.

	 */

	status =

	    acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR, pci_device_node,

					    &pci_value);

	status = acpi_ut_evaluate_numeric_object(METHOD_NAME__ADR,

						 pci_device_node, &pci_value);



	/*

	 * The default is zero, and since the allocation above zeroed the data,
@@ -308,18 +308,16 @@ acpi_ev_pci_config_region_setup(acpi_handle handle, 


	/* The PCI segment number comes from the _SEG method */



	status =

	    acpi_ut_evaluate_numeric_object(METHOD_NAME__SEG, pci_root_node,

					    &pci_value);

	status = acpi_ut_evaluate_numeric_object(METHOD_NAME__SEG,

						 pci_root_node, &pci_value);

	if (ACPI_SUCCESS(status)) {

		pci_id->segment = ACPI_LOWORD(pci_value);

	}



	/* The PCI bus number comes from the _BBN method */



	status =

	    acpi_ut_evaluate_numeric_object(METHOD_NAME__BBN, pci_root_node,

					    &pci_value);

	status = acpi_ut_evaluate_numeric_object(METHOD_NAME__BBN,

						 pci_root_node, &pci_value);

	if (ACPI_SUCCESS(status)) {

		pci_id->bus = ACPI_LOWORD(pci_value);

	}
@@ -632,8 +630,8 @@ acpi_ev_initialize_region(union acpi_operand_object *region_obj, 
								  acpi_ns_locked);



					/*

					 * Tell all users that this region is usable by running the _REG

					 * method

					 * Tell all users that this region is usable by

					 * running the _REG method

					 */

					if (acpi_ns_locked) {

						status =