ACPICA: Cleanup coding style to reduce differences between Linux and ACPICA.
authorLv Zheng <lv.zheng@intel.com>
Wed, 19 Dec 2012 05:37:21 +0000 (05:37 +0000)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 10 Jan 2013 11:36:18 +0000 (12:36 +0100)
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 314 lines of 20121018 divergence.diff.

ACPICA core uses ()'s on return statements. This is a known and committed
differences from Linux standard coding style.

This patch cleans up the Linux side ACPICA code to use this codying style
in order to reduce the source code differences between Linux and ACPICA.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/acpi/acpica/exconfig.c
drivers/acpi/acpica/hwgpe.c
drivers/acpi/acpica/hwvalid.c
drivers/acpi/acpica/nspredef.c
drivers/acpi/acpica/nswalk.c
drivers/acpi/acpica/nsxfname.c
drivers/acpi/acpica/rscalc.c
drivers/acpi/acpica/rsutils.c
drivers/acpi/acpica/tbutils.c
drivers/acpi/acpica/utcopy.c
drivers/acpi/acpica/utlock.c

index b4f42f56fc340d64fac2cee3de2e8684c5017b53..d0cc2a40edfb4a619de22d945bbf86fbe5348ff6 100644 (file)
@@ -304,7 +304,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
                    acpi_ev_address_space_dispatch(obj_desc, NULL, ACPI_READ,
                                                   region_offset, 8, &value);
                if (ACPI_FAILURE(status)) {
-                       return status;
+                       return (status);
                }
 
                *buffer = (u8)value;
@@ -312,7 +312,7 @@ acpi_ex_region_read(union acpi_operand_object *obj_desc, u32 length, u8 *buffer)
                region_offset++;
        }
 
-       return AE_OK;
+       return (AE_OK);
 }
 
 /*******************************************************************************
index 64560045052dd152d70e4b404af9a11d1b43b57e..095666bdad076d7b981760582b8240672f6f53c2 100644 (file)
@@ -69,8 +69,10 @@ acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 u32 acpi_hw_get_gpe_register_bit(struct acpi_gpe_event_info *gpe_event_info)
 {
-       return (u32)1 << (gpe_event_info->gpe_number -
-                gpe_event_info->register_info->base_gpe_number);
+
+       return ((u32)1 <<
+               (gpe_event_info->gpe_number -
+                gpe_event_info->register_info->base_gpe_number));
 }
 
 /******************************************************************************
index b6aae58299dc36dce839d7e74a4f17adcef36b98..70686cd0332e10d0c66c5370cfe95358832dab33 100644 (file)
@@ -135,7 +135,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width)
        if ((bit_width != 8) && (bit_width != 16) && (bit_width != 32)) {
                ACPI_ERROR((AE_INFO,
                            "Bad BitWidth parameter: %8.8X", bit_width));
-               return AE_BAD_PARAMETER;
+               return (AE_BAD_PARAMETER);
        }
 
        port_info = acpi_protected_ports;
@@ -234,11 +234,11 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
        status = acpi_hw_validate_io_request(address, width);
        if (ACPI_SUCCESS(status)) {
                status = acpi_os_read_port(address, value, width);
-               return status;
+               return (status);
        }
 
        if (status != AE_AML_ILLEGAL_ADDRESS) {
-               return status;
+               return (status);
        }
 
        /*
@@ -253,7 +253,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
                if (acpi_hw_validate_io_request(address, 8) == AE_OK) {
                        status = acpi_os_read_port(address, &one_byte, 8);
                        if (ACPI_FAILURE(status)) {
-                               return status;
+                               return (status);
                        }
 
                        *value |= (one_byte << i);
@@ -262,7 +262,7 @@ acpi_status acpi_hw_read_port(acpi_io_address address, u32 *value, u32 width)
                address++;
        }
 
-       return AE_OK;
+       return (AE_OK);
 }
 
 /******************************************************************************
@@ -297,11 +297,11 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width)
        status = acpi_hw_validate_io_request(address, width);
        if (ACPI_SUCCESS(status)) {
                status = acpi_os_write_port(address, value, width);
-               return status;
+               return (status);
        }
 
        if (status != AE_AML_ILLEGAL_ADDRESS) {
-               return status;
+               return (status);
        }
 
        /*
@@ -317,12 +317,12 @@ acpi_status acpi_hw_write_port(acpi_io_address address, u32 value, u32 width)
                        status =
                            acpi_os_write_port(address, (value >> i) & 0xFF, 8);
                        if (ACPI_FAILURE(status)) {
-                               return status;
+                               return (status);
                        }
                }
 
                address++;
        }
 
-       return AE_OK;
+       return (AE_OK);
 }
index 352be3bd15627b4bb26c8c9b209d1aecac76202c..1f0e934014367f8e6fca832881e3859a23475afa 100644 (file)
@@ -147,7 +147,7 @@ acpi_ns_check_predefined_names(struct acpi_namespace_node *node,
 
        pathname = acpi_ns_get_external_pathname(node);
        if (!pathname) {
-               return AE_OK;   /* Could not get pathname, ignore */
+               return (AE_OK); /* Could not get pathname, ignore */
        }
 
        /*
index 0483877f26b813113cecea55da8e644c902d4eb5..4657e75624c4298940699aabd76e4318e18e130d 100644 (file)
@@ -76,12 +76,12 @@ struct acpi_namespace_node *acpi_ns_get_next_node(struct acpi_namespace_node
 
                /* It's really the parent's _scope_ that we want */
 
-               return parent_node->child;
+               return (parent_node->child);
        }
 
        /* Otherwise just return the next peer */
 
-       return child_node->peer;
+       return (child_node->peer);
 }
 
 /*******************************************************************************
index 811c6f13f476c81fbb052da737a2c10fb961de91..520bab471dbf663ae9d6cc0f05217d3d70642548 100644 (file)
@@ -539,14 +539,14 @@ acpi_status acpi_install_method(u8 *buffer)
        /* Parameter validation */
 
        if (!buffer) {
-               return AE_BAD_PARAMETER;
+               return (AE_BAD_PARAMETER);
        }
 
        /* Table must be a DSDT or SSDT */
 
        if (!ACPI_COMPARE_NAME(table->signature, ACPI_SIG_DSDT) &&
            !ACPI_COMPARE_NAME(table->signature, ACPI_SIG_SSDT)) {
-               return AE_BAD_HEADER;
+               return (AE_BAD_HEADER);
        }
 
        /* First AML opcode in the table must be a control method */
@@ -554,7 +554,7 @@ acpi_status acpi_install_method(u8 *buffer)
        parser_state.aml = buffer + sizeof(struct acpi_table_header);
        opcode = acpi_ps_peek_opcode(&parser_state);
        if (opcode != AML_METHOD_OP) {
-               return AE_BAD_PARAMETER;
+               return (AE_BAD_PARAMETER);
        }
 
        /* Extract method information from the raw AML */
@@ -572,13 +572,13 @@ acpi_status acpi_install_method(u8 *buffer)
         */
        aml_buffer = ACPI_ALLOCATE(aml_length);
        if (!aml_buffer) {
-               return AE_NO_MEMORY;
+               return (AE_NO_MEMORY);
        }
 
        method_obj = acpi_ut_create_internal_object(ACPI_TYPE_METHOD);
        if (!method_obj) {
                ACPI_FREE(aml_buffer);
-               return AE_NO_MEMORY;
+               return (AE_NO_MEMORY);
        }
 
        /* Lock namespace for acpi_ns_lookup, we may be creating a new node */
@@ -644,12 +644,12 @@ acpi_status acpi_install_method(u8 *buffer)
        /* Remove local reference to the method object */
 
        acpi_ut_remove_reference(method_obj);
-       return status;
+       return (status);
 
 error_exit:
 
        ACPI_FREE(aml_buffer);
        ACPI_FREE(method_obj);
-       return status;
+       return (status);
 }
 ACPI_EXPORT_SYMBOL(acpi_install_method)
index 147feb6aa2a0b3bdf26a9887ca84c362a2532cdc..4f39bd663099ff2d4da9d7d0bd2daa09d508697f 100644 (file)
@@ -84,7 +84,7 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
                bit_field &= (u16) (bit_field - 1);
        }
 
-       return bits_set;
+       return (bits_set);
 }
 
 /*******************************************************************************
index 441447f238f0ef045854d833640203883a283932..5adae5a036aad753af2cdd2fdb79bd64635e0d32 100644 (file)
@@ -108,7 +108,7 @@ u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
                mask |= (0x1 << list[i]);
        }
 
-       return mask;
+       return (mask);
 }
 
 /*******************************************************************************
index 285e24b973822812d069721aeb44acc9908229f0..e3cc315d7744391854443ec93cfef943f926e668 100644 (file)
@@ -147,7 +147,7 @@ acpi_status acpi_tb_initialize_facs(void)
                                         ACPI_CAST_INDIRECT_PTR(struct
                                                                acpi_table_header,
                                                                &acpi_gbl_FACS));
-       return status;
+       return (status);
 }
 #endif                         /* !ACPI_REDUCED_HARDWARE */
 
index 294692ae76e918e25ab56e43b36b86d26950ea00..99549eeac0c647c1bd05b8912466ce196936ee0f 100644 (file)
@@ -785,7 +785,7 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
 
                status = acpi_os_create_mutex(&dest_desc->mutex.os_mutex);
                if (ACPI_FAILURE(status)) {
-                       return status;
+                       return (status);
                }
                break;
 
@@ -795,7 +795,7 @@ acpi_ut_copy_simple_object(union acpi_operand_object *source_desc,
                                                  &dest_desc->event.
                                                  os_semaphore);
                if (ACPI_FAILURE(status)) {
-                       return status;
+                       return (status);
                }
                break;
 
index b1eb7f17e11065a608be7e8095bf24b9e1d17fb7..8d1a7499e401d0ec90f4bba9147374254a74dbb1 100644 (file)
@@ -66,11 +66,11 @@ acpi_status acpi_ut_create_rw_lock(struct acpi_rw_lock *lock)
        lock->num_readers = 0;
        status = acpi_os_create_mutex(&lock->reader_mutex);
        if (ACPI_FAILURE(status)) {
-               return status;
+               return (status);
        }
 
        status = acpi_os_create_mutex(&lock->writer_mutex);
-       return status;
+       return (status);
 }
 
 void acpi_ut_delete_rw_lock(struct acpi_rw_lock *lock)
@@ -108,7 +108,7 @@ acpi_status acpi_ut_acquire_read_lock(struct acpi_rw_lock *lock)
 
        status = acpi_os_acquire_mutex(lock->reader_mutex, ACPI_WAIT_FOREVER);
        if (ACPI_FAILURE(status)) {
-               return status;
+               return (status);
        }
 
        /* Acquire the write lock only for the first reader */
@@ -121,7 +121,7 @@ acpi_status acpi_ut_acquire_read_lock(struct acpi_rw_lock *lock)
        }
 
        acpi_os_release_mutex(lock->reader_mutex);
-       return status;
+       return (status);
 }
 
 acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
@@ -130,7 +130,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
 
        status = acpi_os_acquire_mutex(lock->reader_mutex, ACPI_WAIT_FOREVER);
        if (ACPI_FAILURE(status)) {
-               return status;
+               return (status);
        }
 
        /* Release the write lock only for the very last reader */
@@ -141,7 +141,7 @@ acpi_status acpi_ut_release_read_lock(struct acpi_rw_lock *lock)
        }
 
        acpi_os_release_mutex(lock->reader_mutex);
-       return status;
+       return (status);
 }
 
 /*******************************************************************************
@@ -165,7 +165,7 @@ acpi_status acpi_ut_acquire_write_lock(struct acpi_rw_lock *lock)
        acpi_status status;
 
        status = acpi_os_acquire_mutex(lock->writer_mutex, ACPI_WAIT_FOREVER);
-       return status;
+       return (status);
 }
 
 void acpi_ut_release_write_lock(struct acpi_rw_lock *lock)