5 files changed, 22 insertions, 26 deletions

diff --git a/drivers/acpi/namespace/nsdump.c b/drivers/acpi/namespace/nsdump.c
index 5445751b8a3e..904f9510c0e2 100644
--- a/drivers/acpi/namespace/nsdump.c
+++ b/drivers/acpi/namespace/nsdump.c
@@ -73,7 +73,7 @@ acpi_ns_dump_one_device(acpi_handle obj_handle,
 
 void acpi_ns_print_pathname(u32 num_segments, char *pathname)
 {
-        acpi_native_uint i;
+        u32 i;
 
         ACPI_FUNCTION_NAME(ns_print_pathname);
 
diff --git a/drivers/acpi/namespace/nsload.c b/drivers/acpi/namespace/nsload.c
index 2c92f6cf5ce1..a4a412b7c029 100644
--- a/drivers/acpi/namespace/nsload.c
+++ b/drivers/acpi/namespace/nsload.c
@@ -71,8 +71,7 @@ static acpi_status acpi_ns_delete_subtree(acpi_handle start_handle);
  ******************************************************************************/
 
 acpi_status
-acpi_ns_load_table(acpi_native_uint table_index,
-                   struct acpi_namespace_node *node)
+acpi_ns_load_table(u32 table_index, struct acpi_namespace_node *node)
 {
         acpi_status status;
 
diff --git a/drivers/acpi/namespace/nsparse.c b/drivers/acpi/namespace/nsparse.c
index 46a79b0103b6..a82271a9dbb3 100644
--- a/drivers/acpi/namespace/nsparse.c
+++ b/drivers/acpi/namespace/nsparse.c
@@ -63,13 +63,13 @@ ACPI_MODULE_NAME("nsparse")
  *
  ******************************************************************************/
 acpi_status
-acpi_ns_one_complete_parse(acpi_native_uint pass_number,
-                           acpi_native_uint table_index,
-                           struct acpi_namespace_node * start_node)
+acpi_ns_one_complete_parse(u32 pass_number,
+                           u32 table_index,
+                           struct acpi_namespace_node *start_node)
 {
         union acpi_parse_object *parse_root;
         acpi_status status;
-        acpi_native_uint aml_length;
+       u32 aml_length;
         u8 *aml_start;
         struct acpi_walk_state *walk_state;
         struct acpi_table_header *table;
@@ -112,8 +112,8 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
                 aml_start = (u8 *) table + sizeof(struct acpi_table_header);
                 aml_length = table->length - sizeof(struct acpi_table_header);
                 status = acpi_ds_init_aml_walk(walk_state, parse_root, NULL,
-                                               aml_start, (u32) aml_length,
-                                               NULL, (u8) pass_number);
+                                               aml_start, aml_length, NULL,
+                                               (u8) pass_number);
         }
 
         if (ACPI_FAILURE(status)) {
@@ -158,8 +158,7 @@ acpi_ns_one_complete_parse(acpi_native_uint pass_number,
  ******************************************************************************/
 
 acpi_status
-acpi_ns_parse_table(acpi_native_uint table_index,
-                    struct acpi_namespace_node *start_node)
+acpi_ns_parse_table(u32 table_index, struct acpi_namespace_node *start_node)
 {
         acpi_status status;
 
diff --git a/drivers/acpi/namespace/nsutils.c b/drivers/acpi/namespace/nsutils.c
index 64c039843ed2..5b5619c54594 100644
--- a/drivers/acpi/namespace/nsutils.c
+++ b/drivers/acpi/namespace/nsutils.c
@@ -365,7 +365,7 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
         char *internal_name = info->internal_name;
         char *external_name = info->next_external_char;
         char *result = NULL;
-        acpi_native_uint i;
+        u32 i;
 
         ACPI_FUNCTION_TRACE(ns_build_internal_name);
 
@@ -400,12 +400,11 @@ acpi_status acpi_ns_build_internal_name(struct acpi_namestring_info *info)
                         result = &internal_name[i];
                 } else if (num_segments == 2) {
                         internal_name[i] = AML_DUAL_NAME_PREFIX;
-                        result = &internal_name[(acpi_native_uint) (i + 1)];
+                        result = &internal_name[(acpi_size) i + 1];
                 } else {
                         internal_name[i] = AML_MULTI_NAME_PREFIX_OP;
-                        internal_name[(acpi_native_uint) (i + 1)] =
-                            (char)num_segments;
-                        result = &internal_name[(acpi_native_uint) (i + 2)];
+                        internal_name[(acpi_size) i + 1] = (char)num_segments;
+                        result = &internal_name[(acpi_size) i + 2];
                 }
         }
 
@@ -531,12 +530,12 @@ acpi_ns_externalize_name(u32 internal_name_length,
                          char *internal_name,
                          u32 * converted_name_length, char **converted_name)
 {
-        acpi_native_uint names_index = 0;
-        acpi_native_uint num_segments = 0;
-        acpi_native_uint required_length;
-        acpi_native_uint prefix_length = 0;
-        acpi_native_uint i = 0;
-        acpi_native_uint j = 0;
+        u32 names_index = 0;
+        u32 num_segments = 0;
+        u32 required_length;
+        u32 prefix_length = 0;
+        u32 i = 0;
+        u32 j = 0;
 
         ACPI_FUNCTION_TRACE(ns_externalize_name);
 
@@ -582,9 +581,8 @@ acpi_ns_externalize_name(u32 internal_name_length,
                         /* <count> 4-byte names */
 
                         names_index = prefix_length + 2;
-                        num_segments = (acpi_native_uint) (u8)
-                            internal_name[(acpi_native_uint)
-                                          (prefix_length + 1)];
+                        num_segments = (u8)
+                            internal_name[(acpi_size) prefix_length + 1];
                         break;
 
                 case AML_DUAL_NAME_PREFIX:
diff --git a/drivers/acpi/namespace/nsxfeval.c b/drivers/acpi/namespace/nsxfeval.c
index b4e135eab7c7..38be5865d95d 100644
--- a/drivers/acpi/namespace/nsxfeval.c
+++ b/drivers/acpi/namespace/nsxfeval.c
@@ -441,7 +441,7 @@ acpi_ns_get_device_callback(acpi_handle obj_handle,
         u32 flags;
         struct acpica_device_id hid;
         struct acpi_compatible_id_list *cid;
-        acpi_native_uint i;
+        u32 i;
         int found;
 
         status = acpi_ut_acquire_mutex(ACPI_MTX_NAMESPACE);