ACPICA: Linuxize: Reduce divergences for 20150616 release

This patch reduces source code differences between the Linux kernel and the
ACPICA upstream so that the linuxized ACPICA 20150616 release can be
applied with reduced human intervention.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/acpica/dsobject.c b/drivers/acpi/acpica/dsobject.c
index 8a7b07b6adc81a761cefcb2689c82de187eb82b2..4a4b2f343713f0f92b607544a0a560f558718e50 100644 (file)
--- a/drivers/acpi/acpica/dsobject.c
+++ b/drivers/acpi/acpica/dsobject.c
@@ -751,7 +751,7 @@ acpi_ds_init_object_from_op(struct acpi_walk_state *walk_state,
 
                obj_desc->string.pointer = op->common.value.string;
                obj_desc->string.length =
-                   (u32) ACPI_STRLEN(op->common.value.string);
+                   (u32)ACPI_STRLEN(op->common.value.string);
 
                /*
                 * The string is contained in the ACPI table, don't ever try

diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
index 3b3767698827f9d2553af49a3bdbdbae9f331613..82e310b94ae4681ca2923336436f0edea3bafec3 100644 (file)
--- a/drivers/acpi/acpica/hwxfsleep.c
+++ b/drivers/acpi/acpica/hwxfsleep.c
@@ -138,7 +138,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address)
 {
        ACPI_FUNCTION_TRACE(acpi_set_firmware_waking_vector64);
 
-
        /* Determine if the 64-bit vector actually exists */
 
        if ((acpi_gbl_FACS->length <= 32) || (acpi_gbl_FACS->version < 1)) {
@@ -154,7 +153,6 @@ acpi_status acpi_set_firmware_waking_vector64(u64 physical_address)
 
 ACPI_EXPORT_SYMBOL(acpi_set_firmware_waking_vector64)
 #endif
-
 /*******************************************************************************
  *
  * FUNCTION:    acpi_enter_sleep_state_s4bios

diff --git a/drivers/acpi/acpica/rscreate.c b/drivers/acpi/acpica/rscreate.c
index 15434e4c9b344411f6b3c0ec8dbb5193f81b9e41..f30f35e6ff2a19aa4d6fc6a8e64874105d788733 100644 (file)
--- a/drivers/acpi/acpica/rscreate.c
+++ b/drivers/acpi/acpica/rscreate.c
@@ -353,7 +353,7 @@ acpi_rs_create_pci_routing_table(union acpi_operand_object *package_object,
                                /* +1 to include null terminator */
 
                                user_prt->length +=
-                                   (u32) ACPI_STRLEN(user_prt->source) + 1;
+                                   (u32)ACPI_STRLEN(user_prt->source) + 1;
                                break;
 
                        case ACPI_TYPE_STRING:

diff --git a/drivers/acpi/acpica/rsutils.c b/drivers/acpi/acpica/rsutils.c
index ece3cd60cc6a0664608cbe97b1110845ce26330d..90417de38dab6fbaa72f9596dea605918251026b 100644 (file)
--- a/drivers/acpi/acpica/rsutils.c
+++ b/drivers/acpi/acpica/rsutils.c
@@ -367,7 +367,7 @@ acpi_rs_get_resource_source(acpi_rs_length resource_length,
                    (u32)
                    ACPI_STRLEN(ACPI_CAST_PTR(char, &aml_resource_source[1])) +
                    1;
-               total_length = (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
+               total_length = (u32)ACPI_ROUND_UP_TO_NATIVE_WORD(total_length);
 
                ACPI_MEMSET(resource_source->string_ptr, 0, total_length);
 

diff --git a/drivers/acpi/acpica/tbxface.c b/drivers/acpi/acpica/tbxface.c
index 60e94f87f27aeea917c9705358ea4675666363d9..54b9f7957ff1ca93565d49d6df1f9d84084379a5 100644 (file)
--- a/drivers/acpi/acpica/tbxface.c
+++ b/drivers/acpi/acpica/tbxface.c
@@ -242,6 +242,7 @@ acpi_get_table_header(char *signature,
                                if (!header) {
                                        return (AE_NO_MEMORY);
                                }
+
                                ACPI_MEMCPY(out_table_header, header,
                                            sizeof(struct acpi_table_header));
                                acpi_os_unmap_memory(header,

diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h
index 073997d729e9c9710c10656ff3f34c6e30527c34..1e84e62b448dee3bcbfb925ab9435353a20ea2cf 100644 (file)
--- a/include/acpi/platform/acenv.h
+++ b/include/acpi/platform/acenv.h
@@ -359,7 +359,6 @@
 #define ACPI_MEMCMP(s1,s2,n)    memcmp((const char *)(s1), (const char *)(s2), (acpi_size)(n))
 #define ACPI_MEMCPY(d,s,n)      (void) memcpy((d), (s), (acpi_size)(n))
 #define ACPI_MEMSET(d,s,n)      (void) memset((d), (s), (acpi_size)(n))
-
 #define ACPI_TOUPPER(i)         toupper((int) (i))
 #define ACPI_TOLOWER(i)         tolower((int) (i))
 #define ACPI_IS_XDIGIT(i)       isxdigit((int) (i))