Merge tag 'md/4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md

[sfrench/cifs-2.6.git] / drivers / acpi / acpica / exfldio.c

diff --git a/drivers/acpi/acpica/exfldio.c b/drivers/acpi/acpica/exfldio.c
index f0c5ed0b7db8c10e0636817c6e76571c5672bbbb..ee76d299b3d0da7588b09022ac6a3f668b208dd1 100644 (file)
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
@@ -164,7 +164,7 @@ acpi_ex_setup_region(union acpi_operand_object *obj_desc,
                        if (ACPI_ROUND_UP(rgn_desc->region.length,
                                          obj_desc->common_field.
                                          access_byte_width) >=
-                           ((acpi_size) obj_desc->common_field.
+                           ((acpi_size)obj_desc->common_field.
                             base_byte_offset +
                             obj_desc->common_field.access_byte_width +
                             field_datum_byte_offset)) {
@@ -897,17 +897,9 @@ acpi_ex_insert_into_field(union acpi_operand_object *obj_desc,
 
        access_bit_width = ACPI_MUL_8(obj_desc->common_field.access_byte_width);
 
-       /*
-        * Create the bitmasks used for bit insertion.
-        * Note: This if/else is used to bypass compiler differences with the
-        * shift operator
-        */
-       if (access_bit_width == ACPI_INTEGER_BIT_SIZE) {
-               width_mask = ACPI_UINT64_MAX;
-       } else {
-               width_mask = ACPI_MASK_BITS_ABOVE(access_bit_width);
-       }
+       /* Create the bitmasks used for bit insertion */
 
+       width_mask = ACPI_MASK_BITS_ABOVE_64(access_bit_width);
        mask = width_mask &
            ACPI_MASK_BITS_BELOW(obj_desc->common_field.start_field_bit_offset);