diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-28 09:02:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-28 09:02:18 -0800 |
| commit | c60c04021353c55b133519804734415f647f08bd (patch) | |
| tree | 193679c93495cef83ebbaeda3261cf246e27bda3 /include/acpi | |
| parent | 36428598126ec20329537825ecd855ac77334301 (diff) | |
| parent | cabe17d0173ab04bd3f87b8199ae75f43f1ea473 (diff) | |
| download | linux-c60c04021353c55b133519804734415f647f08bd.tar.gz linux-c60c04021353c55b133519804734415f647f08bd.tar.bz2 linux-c60c04021353c55b133519804734415f647f08bd.zip | |
Merge tag 'acpi-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes from Rafael Wysocki:
"Fix a couple of configuration issues in the ACPI watchdog (WDAT)
driver (Mika Westerberg) and make it possible to disable that driver
at boot time in case it still does not work as expected (Jean
Delvare)"
* tag 'acpi-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI: watchdog: Set default timeout in probe
ACPI: watchdog: Fix gas->access_width usage
ACPICA: Introduce ACPI_ACCESS_BYTE_WIDTH() macro
ACPI: watchdog: Allow disabling WDAT at boot
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/actypes.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index a2583c2bc054..4defed58ea33 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -532,11 +532,12 @@ typedef u64 acpi_integer; strnlen (a, ACPI_NAMESEG_SIZE) == ACPI_NAMESEG_SIZE) /* - * Algorithm to obtain access bit width. + * Algorithm to obtain access bit or byte width. * Can be used with access_width of struct acpi_generic_address and access_size of * struct acpi_resource_generic_register. */ #define ACPI_ACCESS_BIT_WIDTH(size) (1 << ((size) + 2)) +#define ACPI_ACCESS_BYTE_WIDTH(size) (1 << ((size) - 1)) /******************************************************************************* * |