aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi/acpica/utresrc.c
diff options
context:
space:
mode:
authorLv Zheng <lv.zheng@intel.com>2012-12-19 00:37:15 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-01-10 06:36:18 -0500
commit3e8214e5c2bd449b30109d4a098597ab1b7c9fb9 (patch)
tree1f256120555cba08aad93c865d02519698732554 /drivers/acpi/acpica/utresrc.c
parent739dcbb90a347a66f25cc0c3ef4eef3d4558f409 (diff)
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: Lv Zheng <lv.zheng@intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/utresrc.c')
-rw-r--r--drivers/acpi/acpica/utresrc.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index e38bef4980bc..7d0a1b5dedff 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -412,7 +412,7 @@ static const u8 acpi_gbl_resource_types[] = {
412 ******************************************************************************/ 412 ******************************************************************************/
413 413
414acpi_status 414acpi_status
415acpi_ut_walk_aml_resources(u8 * aml, 415acpi_ut_walk_aml_resources(u8 *aml,
416 acpi_size aml_length, 416 acpi_size aml_length,
417 acpi_walk_aml_callback user_function, void **context) 417 acpi_walk_aml_callback user_function, void **context)
418{ 418{
@@ -525,7 +525,7 @@ acpi_ut_walk_aml_resources(u8 * aml,
525 * 525 *
526 ******************************************************************************/ 526 ******************************************************************************/
527 527
528acpi_status acpi_ut_validate_resource(void *aml, u8 * return_index) 528acpi_status acpi_ut_validate_resource(void *aml, u8 *return_index)
529{ 529{
530 union aml_resource *aml_resource; 530 union aml_resource *aml_resource;
531 u8 resource_type; 531 u8 resource_type;
@@ -800,8 +800,7 @@ u32 acpi_ut_get_descriptor_length(void *aml)
800 ******************************************************************************/ 800 ******************************************************************************/
801 801
802acpi_status 802acpi_status
803acpi_ut_get_resource_end_tag(union acpi_operand_object * obj_desc, 803acpi_ut_get_resource_end_tag(union acpi_operand_object *obj_desc, u8 **end_tag)
804 u8 ** end_tag)
805{ 804{
806 acpi_status status; 805 acpi_status status;
807 806