/home/lenb/src/to-akpm branch 'acpi-2.6.12'

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / acpi / executer / exstoren.c

diff --git a/drivers/acpi/executer/exstoren.c b/drivers/acpi/executer/exstoren.c
index d3677feb07fd9b6f33cf429eada231a2e78c070a..433588ab432a798b1692befa2a5e869bfbb72f96 100644 (file)
--- a/drivers/acpi/executer/exstoren.c
+++ b/drivers/acpi/executer/exstoren.c
@@ -81,9 +81,8 @@ acpi_ex_resolve_object (
        ACPI_FUNCTION_TRACE ("ex_resolve_object");
 
 
-       /*
-        * Ensure we have a Target that can be stored to
-        */
+       /* Ensure we have a Target that can be stored to */
+
        switch (target_type) {
        case ACPI_TYPE_BUFFER_FIELD:
        case ACPI_TYPE_LOCAL_REGION_FIELD:
@@ -118,16 +117,14 @@ acpi_ex_resolve_object (
                        break;
                }
 
-               /*
-                * Must have a Integer, Buffer, or String
-                */
+               /* Must have a Integer, Buffer, or String */
+
                if ((ACPI_GET_OBJECT_TYPE (source_desc) != ACPI_TYPE_INTEGER)   &&
                        (ACPI_GET_OBJECT_TYPE (source_desc) != ACPI_TYPE_BUFFER)    &&
                        (ACPI_GET_OBJECT_TYPE (source_desc) != ACPI_TYPE_STRING)    &&
                        !((ACPI_GET_OBJECT_TYPE (source_desc) == ACPI_TYPE_LOCAL_REFERENCE) && (source_desc->reference.opcode == AML_LOAD_OP))) {
-                       /*
-                        * Conversion successful but still not a valid type
-                        */
+                       /* Conversion successful but still not a valid type */
+
                        ACPI_DEBUG_PRINT ((ACPI_DB_ERROR,
                                "Cannot assign type %s to %s (must be type Int/Str/Buf)\n",
                                acpi_ut_get_object_type_name (source_desc),
@@ -140,9 +137,8 @@ acpi_ex_resolve_object (
        case ACPI_TYPE_LOCAL_ALIAS:
        case ACPI_TYPE_LOCAL_METHOD_ALIAS:
 
-               /*
-                * Aliases are resolved by acpi_ex_prep_operands
-                */
+               /* Aliases are resolved by acpi_ex_prep_operands */
+
                ACPI_REPORT_ERROR (("Store into Alias - should never happen\n"));
                status = AE_AML_INTERNAL;
                break;
@@ -269,10 +265,6 @@ acpi_ex_store_object_to_object (
 
        case ACPI_TYPE_BUFFER:
 
-               /*
-                * Note: There is different store behavior depending on the original
-                * source type
-                */
                status = acpi_ex_store_buffer_to_buffer (actual_src_desc, dest_desc);
                break;