diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2016-12-23 04:35:14 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2016-12-23 04:35:14 +0000 |
| commit | f2e6c39316f68b7ccc7abb766f82ed421c8e22b4 (patch) | |
| tree | 2c9acd96afc9afb47a31a88c97ac4907faee46d9 /source/components/executer | |
| parent | a56e3c255d5c5dfa4dd3a2fda4705a1607a6b7f3 (diff) | |
Notes
Diffstat (limited to 'source/components/executer')
| -rw-r--r-- | source/components/executer/exconfig.c | 2 | ||||
| -rw-r--r-- | source/components/executer/exfldio.c | 15 |
2 files changed, 3 insertions, 14 deletions
diff --git a/source/components/executer/exconfig.c b/source/components/executer/exconfig.c index f49b0a9fa9bb..c61b1489225e 100644 --- a/source/components/executer/exconfig.c +++ b/source/components/executer/exconfig.c @@ -224,7 +224,7 @@ AcpiExLoadTableOp ( AcpiExEnterInterpreter (); if (ACPI_FAILURE (Status)) { - return_ACPI_STATUS (Status); + return_ACPI_STATUS (Status); } Status = AcpiExAddTable (TableIndex, &DdbHandle); diff --git a/source/components/executer/exfldio.c b/source/components/executer/exfldio.c index fd46a0c02367..a865a86ae1f3 100644 --- a/source/components/executer/exfldio.c +++ b/source/components/executer/exfldio.c @@ -946,20 +946,9 @@ AcpiExInsertIntoField ( AccessBitWidth = ACPI_MUL_8 (ObjDesc->CommonField.AccessByteWidth); - /* - * Create the bitmasks used for bit insertion. - * Note: This if/else is used to bypass compiler differences with the - * shift operator - */ - if (AccessBitWidth == ACPI_INTEGER_BIT_SIZE) - { - WidthMask = ACPI_UINT64_MAX; - } - else - { - WidthMask = ACPI_MASK_BITS_ABOVE (AccessBitWidth); - } + /* Create the bitmasks used for bit insertion */ + WidthMask = ACPI_MASK_BITS_ABOVE_64 (AccessBitWidth); Mask = WidthMask & ACPI_MASK_BITS_BELOW (ObjDesc->CommonField.StartFieldBitOffset); |