1 files changed, 23 insertions, 23 deletions

diff --git a/drivers/acpi/utilities/uteval.c b/drivers/acpi/utilities/uteval.c
index 7b81d5ef3c32..106cc97cb4af 100644
--- a/drivers/acpi/utilities/uteval.c
+++ b/drivers/acpi/utilities/uteval.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
@@ -95,7 +95,9 @@ acpi_status acpi_ut_osi_implementation(struct acpi_walk_state *walk_state)
 
         for (i = 0; i < ACPI_NUM_OSI_STRINGS; i++) {
                 if (!ACPI_STRCMP(string_desc->string.pointer,
-                                 (char *)acpi_gbl_valid_osi_strings[i])) {
+                                 ACPI_CAST_PTR(char,
+                                               acpi_gbl_valid_osi_strings[i])))
+                {
                         /* This string is supported */
 
                         return_desc->integer.value = 0xFFFFFFFF;
@@ -152,8 +154,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
                                           acpi_ut_get_node_name(prefix_node),
                                           path));
                 } else {
-                        ACPI_REPORT_METHOD_ERROR("Method execution failed",
-                                                 prefix_node, path, status);
+                        ACPI_ERROR_METHOD("Method execution failed",
+                                          prefix_node, path, status);
                 }
 
                 return_ACPI_STATUS(status);
@@ -163,9 +165,8 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
 
         if (!info.return_object) {
                 if (expected_return_btypes) {
-                        ACPI_REPORT_METHOD_ERROR("No object was returned from",
-                                                 prefix_node, path,
-                                                 AE_NOT_EXIST);
+                        ACPI_ERROR_METHOD("No object was returned from",
+                                          prefix_node, path, AE_NOT_EXIST);
 
                         return_ACPI_STATUS(AE_NOT_EXIST);
                 }
@@ -210,15 +211,14 @@ acpi_ut_evaluate_object(struct acpi_namespace_node *prefix_node,
         /* Is the return object one of the expected types? */
 
         if (!(expected_return_btypes & return_btype)) {
-                ACPI_REPORT_METHOD_ERROR("Return object type is incorrect",
-                                         prefix_node, path, AE_TYPE);
+                ACPI_ERROR_METHOD("Return object type is incorrect",
+                                  prefix_node, path, AE_TYPE);
 
-                ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
-                                  "Type returned from %s was incorrect: %s, expected Btypes: %X\n",
-                                  path,
-                                  acpi_ut_get_object_type_name(info.
-                                                               return_object),
-                                  expected_return_btypes));
+                ACPI_ERROR((AE_INFO,
+                            "Type returned from %s was incorrect: %s, expected Btypes: %X",
+                            path,
+                            acpi_ut_get_object_type_name(info.return_object),
+                            expected_return_btypes));
 
                 /* On error exit, we must delete the return object */
 
@@ -592,7 +592,7 @@ acpi_ut_execute_STA(struct acpi_namespace_node *device_node, u32 * flags)
                                           "_STA on %4.4s was not found, assuming device is present\n",
                                           acpi_ut_get_node_name(device_node)));
 
-                        *flags = 0x0F;
+                        *flags = ACPI_UINT32_MAX;
                         status = AE_OK;
                 }
 
@@ -637,17 +637,17 @@ acpi_ut_execute_sxds(struct acpi_namespace_node *device_node, u8 * highest)
         for (i = 0; i < 4; i++) {
                 highest[i] = 0xFF;
                 status = acpi_ut_evaluate_object(device_node,
-                                                 (char *)
-                                                 acpi_gbl_highest_dstate_names
-                                                 [i], ACPI_BTYPE_INTEGER,
-                                                 &obj_desc);
+                                                 ACPI_CAST_PTR(char,
+                                                               acpi_gbl_highest_dstate_names
+                                                               [i]),
+                                                 ACPI_BTYPE_INTEGER, &obj_desc);
                 if (ACPI_FAILURE(status)) {
                         if (status != AE_NOT_FOUND) {
                                 ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
                                                   "%s on Device %4.4s, %s\n",
-                                                  (char *)
-                                                  acpi_gbl_highest_dstate_names
-                                                  [i],
+                                                  ACPI_CAST_PTR(char,
+                                                                acpi_gbl_highest_dstate_names
+                                                                [i]),
                                                   acpi_ut_get_node_name
                                                   (device_node),
                                                   acpi_format_exception