Merge ../linus

[linux-2.6-omap-h63xx.git] / drivers / acpi / utilities / utmath.c

diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c
index 68a0a6f94129845e401e43557326b04d524b7178..19d74bedce27485cc519d3168801cdaa63e0aa1b 100644 (file)
--- a/drivers/acpi/utilities/utmath.c
+++ b/drivers/acpi/utilities/utmath.c
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2005, R. Byron Moore
+ * Copyright (C) 2000 - 2006, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -77,12 +77,12 @@ acpi_ut_short_divide(acpi_integer dividend,
        union uint64_overlay quotient;
        u32 remainder32;
 
-       ACPI_FUNCTION_TRACE("ut_short_divide");
+       ACPI_FUNCTION_TRACE(ut_short_divide);
 
        /* Always check for a zero divisor */
 
        if (divisor == 0) {
-               ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+               ACPI_ERROR((AE_INFO, "Divide by zero"));
                return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
        }
 
@@ -139,12 +139,12 @@ acpi_ut_divide(acpi_integer in_dividend,
        union uint64_overlay partial2;
        union uint64_overlay partial3;
 
-       ACPI_FUNCTION_TRACE("ut_divide");
+       ACPI_FUNCTION_TRACE(ut_divide);
 
        /* Always check for a zero divisor */
 
        if (in_divisor == 0) {
-               ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+               ACPI_ERROR((AE_INFO, "Divide by zero"));
                return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
        }
 
@@ -261,12 +261,12 @@ acpi_ut_short_divide(acpi_integer in_dividend,
                     acpi_integer * out_quotient, u32 * out_remainder)
 {
 
-       ACPI_FUNCTION_TRACE("ut_short_divide");
+       ACPI_FUNCTION_TRACE(ut_short_divide);
 
        /* Always check for a zero divisor */
 
        if (divisor == 0) {
-               ACPI_REPORT_ERROR(("acpi_ut_short_divide: Divide by zero\n"));
+               ACPI_ERROR((AE_INFO, "Divide by zero"));
                return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
        }
 
@@ -287,12 +287,12 @@ acpi_ut_divide(acpi_integer in_dividend,
               acpi_integer in_divisor,
               acpi_integer * out_quotient, acpi_integer * out_remainder)
 {
-       ACPI_FUNCTION_TRACE("ut_divide");
+       ACPI_FUNCTION_TRACE(ut_divide);
 
        /* Always check for a zero divisor */
 
        if (in_divisor == 0) {
-               ACPI_REPORT_ERROR(("acpi_ut_divide: Divide by zero\n"));
+               ACPI_ERROR((AE_INFO, "Divide by zero"));
                return_ACPI_STATUS(AE_AML_DIVIDE_BY_ZERO);
        }