Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e8214e5 authored by Lv Zheng's avatar Lv Zheng Committed by Rafael J. Wysocki
Browse files

ACPICA: Cleanup indentation to reduce differences between Linux and ACPICA. 



This is a cosmetic patch only. Comparison of the resulting binary showed
only line number differences.

This patch does not affect the generation of the Linux binary.
This patch decreases 210 lines of 20121018 divergence.diff.

The ACPICA source codes uses a totally different indentation style from the
Linux to be compatible with other users (operating systems or BIOS).

Indentation differences are critical to the release automation. There are
two causes related to the "indentation" that are affecting the release
automation:
1. The ACPICA -> Linux release process is:
     ACPICA source -- acpisrc - hierarchy - indent ->
     linuxized ACPICA source -- diff ->
     linuxized ACPICA patch (x) -- human intervention ->
     linuxized ACPICA patch (o)
     Where
       'x' means "cannot be directly applied to the Linux"
       'o' means "can be directly applied to the Linux"
   Different "indent" version or "indent" options used in the "indent"
   step will lead to different divergences.
   The version of "indent" used for the current release process is:
     GNU indent 2.2.11
   The options of "indent" used for the current release process is:
     -npro -kr -i8 -ts8 -sob -l80 -ss -ncs
2. Manual indentation prettifying work in the Linux side will also harm the
   automatically generated linuxized ACPICA patches, making them impossible
   to apply directly.

This patch fixes source code differences caused by the two causes so that
the "human intervention" can be reduced in the future.

Signed-off-by: default avatarLv Zheng <lv.zheng@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 739dcbb9

drivers/acpi/acpica/aclocal.h

+1 −0
Original line number Diff line number Diff line
@@ -678,6 +678,7 @@ struct acpi_opcode_info { 
};



/* Value associated with the parse object */



union acpi_parse_value {

	u64 integer;		/* Integer constant (Up to 64 bits) */

	u32 size;		/* bytelist or field size */

drivers/acpi/acpica/evxface.c

+7 −6
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ acpi_remove_notify_handler(acpi_handle device, 
	    (handler_type > ACPI_MAX_NOTIFY_HANDLER_TYPE)) {

		return_ACPI_STATUS(AE_BAD_PARAMETER);

	}



	/* Make sure all deferred notify tasks are completed */



	acpi_os_wait_events_complete();
@@ -622,12 +623,12 @@ acpi_install_gpe_handler(acpi_handle gpe_device, 
		goto free_and_exit;

	}





	handler->address = address;

	handler->context = context;

	handler->method_node = gpe_event_info->dispatch.method_node;

	handler->original_flags = gpe_event_info->flags &

			(ACPI_GPE_XRUPT_TYPE_MASK | ACPI_GPE_DISPATCH_MASK);

	handler->original_flags = (u8)(gpe_event_info->flags &

				       (ACPI_GPE_XRUPT_TYPE_MASK |

				        ACPI_GPE_DISPATCH_MASK));



	/*

	 * If the GPE is associated with a method, it may have been enabled
@@ -746,10 +747,10 @@ acpi_remove_gpe_handler(acpi_handle gpe_device, 
	 * enabled, it should be enabled at this point to restore the

	 * post-initialization configuration.

	 */



	if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD)

	    && handler->originally_enabled)

	if ((handler->original_flags & ACPI_GPE_DISPATCH_METHOD) &&

	    handler->originally_enabled) {

		(void)acpi_ev_add_gpe_reference(gpe_event_info);

	}



	/* Now we can free the handler object */

drivers/acpi/acpica/evxfevnt.c

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ ACPI_MODULE_NAME("evxfevnt") 
 * DESCRIPTION: Transfers the system into ACPI mode.

 *

 ******************************************************************************/



acpi_status acpi_enable(void)

{

	acpi_status status;

drivers/acpi/acpica/evxfgpe.c

+1 −0
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number) 
	acpi_os_release_lock(acpi_gbl_gpe_lock, flags);

	return_ACPI_STATUS(status);

}



ACPI_EXPORT_SYMBOL(acpi_disable_gpe)

drivers/acpi/acpica/exconfig.c

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ acpi_ex_add_table(u32 table_index, 
	 * responsible for discovering any new wake GPEs by running _PRW methods

	 * that may have been loaded by this table.

	 */



	status = acpi_tb_get_owner_id(table_index, &owner_id);

	if (ACPI_SUCCESS(status)) {

		acpi_ev_update_gpes(owner_id);