Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[pandora-kernel.git] / drivers / acpi / resources / rsmisc.c

diff --git a/drivers/acpi/resources/rsmisc.c b/drivers/acpi/resources/rsmisc.c
index 83bfe0d..faf6e10 100644 (file)
--- a/drivers/acpi/resources/rsmisc.c
+++ b/drivers/acpi/resources/rsmisc.c
@@ -81,12 +81,15 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
        u16 item_count = 0;
        u16 temp16 = 0;
 
-       ACPI_FUNCTION_TRACE("rs_get_resource");
+       ACPI_FUNCTION_TRACE(rs_convert_aml_to_resource);
 
        if (((acpi_native_uint) resource) & 0x3) {
-               acpi_os_printf
-                   ("**** GET: Misaligned resource pointer: %p Type %2.2X Len %X\n",
-                    resource, resource->type, resource->length);
+
+               /* Each internal resource struct is expected to be 32-bit aligned */
+
+               ACPI_WARNING((AE_INFO,
+                             "Misaligned resource pointer (get): %p Type %2.2X Len %X",
+                             resource, resource->type, resource->length));
        }
 
        /* Extract the resource Length field (does not include header length) */
@@ -274,15 +277,16 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
                                break;
 
                        default:
-                               acpi_os_printf
-                                   ("*** Invalid conversion sub-opcode\n");
+
+                               ACPI_ERROR((AE_INFO,
+                                           "Invalid conversion sub-opcode"));
                                return_ACPI_STATUS(AE_BAD_PARAMETER);
                        }
                        break;
 
                default:
 
-                       acpi_os_printf("*** Invalid conversion opcode\n");
+                       ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
                        return_ACPI_STATUS(AE_BAD_PARAMETER);
                }
 
@@ -292,9 +296,11 @@ acpi_rs_convert_aml_to_resource(struct acpi_resource *resource,
 
       exit:
        if (!flags_mode) {
-               /* Round the resource struct length up to the next 32-bit boundary */
 
-               resource->length = ACPI_ROUND_UP_to_32_bITS(resource->length);
+               /* Round the resource struct length up to the next boundary (32 or 64) */
+
+               resource->length =
+                   (u32) ACPI_ROUND_UP_TO_NATIVE_WORD(resource->length);
        }
        return_ACPI_STATUS(AE_OK);
 }
@@ -326,7 +332,7 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
        u16 temp16 = 0;
        u16 item_count = 0;
 
-       ACPI_FUNCTION_TRACE("rs_convert_resource_to_aml");
+       ACPI_FUNCTION_TRACE(rs_convert_resource_to_aml);
 
        /*
         * First table entry must be ACPI_RSC_INITxxx and must contain the
@@ -486,15 +492,16 @@ acpi_rs_convert_resource_to_aml(struct acpi_resource *resource,
                                break;
 
                        default:
-                               acpi_os_printf
-                                   ("*** Invalid conversion sub-opcode\n");
+
+                               ACPI_ERROR((AE_INFO,
+                                           "Invalid conversion sub-opcode"));
                                return_ACPI_STATUS(AE_BAD_PARAMETER);
                        }
                        break;
 
                default:
 
-                       acpi_os_printf("*** Invalid conversion opcode\n");
+                       ACPI_ERROR((AE_INFO, "Invalid conversion opcode"));
                        return_ACPI_STATUS(AE_BAD_PARAMETER);
                }
 
@@ -523,19 +530,22 @@ if (((aml->irq.flags & 0x09) == 0x00) || ((aml->irq.flags & 0x09) == 0x09)) {
         * polarity/trigger interrupts are allowed (ACPI spec, section
         * "IRQ Format"), so 0x00 and 0x09 are illegal.
         */
-       ACPI_REPORT_ERROR(("Invalid interrupt polarity/trigger in resource list, %X\n", aml->irq.flags));
+       ACPI_ERROR((AE_INFO,
+                   "Invalid interrupt polarity/trigger in resource list, %X",
+                   aml->irq.flags));
        return_ACPI_STATUS(AE_BAD_DATA);
 }
 
 resource->data.extended_irq.interrupt_count = temp8;
 if (temp8 < 1) {
+
        /* Must have at least one IRQ */
 
        return_ACPI_STATUS(AE_AML_BAD_RESOURCE_LENGTH);
 }
 
 if (resource->data.dma.transfer == 0x03) {
-       ACPI_REPORT_ERROR(("Invalid DMA.Transfer preference (3)\n"));
+       ACPI_ERROR((AE_INFO, "Invalid DMA.Transfer preference (3)"));
        return_ACPI_STATUS(AE_BAD_DATA);
 }
 #endif