2 files changed, 6 insertions, 6 deletions

diff --git a/drivers/acpi/resources/rscalc.c b/drivers/acpi/resources/rscalc.c
index 0dd2ce8a347..dcc51e92ac9 100644
--- a/drivers/acpi/resources/rscalc.c
+++ b/drivers/acpi/resources/rscalc.c
@@ -73,7 +73,7 @@ acpi_rs_stream_option_length(u32 resource_length, u32 minimum_total_length);
 
 static u8 acpi_rs_count_set_bits(u16 bit_field)
 {
-        u8 bits_set;
+        acpi_native_uint bits_set;
 
         ACPI_FUNCTION_ENTRY();
 
@@ -81,10 +81,10 @@ static u8 acpi_rs_count_set_bits(u16 bit_field)
 
                 /* Zero the least significant bit that is set */
 
-                bit_field &= (bit_field - 1);
+                bit_field &= (u16) (bit_field - 1);
         }
 
-        return (bits_set);
+        return ((u8) bits_set);
 }
 
 /*******************************************************************************
diff --git a/drivers/acpi/resources/rsutils.c b/drivers/acpi/resources/rsutils.c
index 11c0bd7b9cf..935a4827e7a 100644
--- a/drivers/acpi/resources/rsutils.c
+++ b/drivers/acpi/resources/rsutils.c
@@ -97,17 +97,17 @@ u8 acpi_rs_decode_bitmask(u16 mask, u8 * list)
 u16 acpi_rs_encode_bitmask(u8 * list, u8 count)
 {
         acpi_native_uint i;
-        u16 mask;
+        acpi_native_uint mask;
 
         ACPI_FUNCTION_ENTRY();
 
         /* Encode the list into a single bitmask */
 
         for (i = 0, mask = 0; i < count; i++) {
-                mask |= (0x0001 << list[i]);
+                mask |= (0x1 << list[i]);
         }
 
-        return (mask);
+        return ((u16) mask);
 }
 
 /*******************************************************************************