diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-10 23:29:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-10 23:29:04 +0300 |
| commit | 926de8c4326c14fcf35f1de142019043597a4fac (patch) | |
| tree | e6a1d59f16438a9231b551b28d87f0abee8dfe93 | |
| parent | d6498af58f5c7fb7b252f4791620fe4dd7213ca3 (diff) | |
| parent | 8fbc1c5b91133f7ae5254061d2cb3326992635c4 (diff) | |
| download | linux-926de8c4326c14fcf35f1de142019043597a4fac.tar.xz | |
Merge tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki:
"These prevent a confusing PRMT-related message from being printed,
drop an unnecessary header file include and update the list of ACPICA
maintainers.
Specifics:
- Prevent a message about missing PRMT from being printed on systems
that do not support PRM, which are the majority now (Aubrey Li).
- Drop unnecessary header include from scan.c (Kari Argillander).
- Update the list of ACPICA maintainers after recent departure of one
of them (Rafael Wysocki)"
* tag 'acpi-5.15-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPICA: Update the list of maintainers
ACPI: PRM: Find PRMT table before parsing it
ACPI: scan: Remove unneeded header linux/nls.h
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/acpi/prmt.c | 10 | ||||
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
3 files changed, 9 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 256a942440c4..0590fe14b3bc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -364,7 +364,6 @@ F: drivers/acpi/apei/ ACPI COMPONENT ARCHITECTURE (ACPICA) M: Robert Moore <robert.moore@intel.com> -M: Erik Kaneda <erik.kaneda@intel.com> M: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> L: linux-acpi@vger.kernel.org L: devel@acpica.org diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c index 1f6007abcf18..89c22bc55057 100644 --- a/drivers/acpi/prmt.c +++ b/drivers/acpi/prmt.c @@ -288,10 +288,18 @@ invalid_guid: void __init init_prmt(void) { + struct acpi_table_header *tbl; acpi_status status; - int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) + + int mc; + + status = acpi_get_table(ACPI_SIG_PRMT, 0, &tbl); + if (ACPI_FAILURE(status)) + return; + + mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) + sizeof (struct acpi_table_prmt_header), 0, acpi_parse_prmt, 0); + acpi_put_table(tbl); /* * Return immediately if PRMT table is not present or no PRM module found. */ diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index b24513ec3fae..5b54c80b9d32 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -16,7 +16,6 @@ #include <linux/signal.h> #include <linux/kthread.h> #include <linux/dmi.h> -#include <linux/nls.h> #include <linux/dma-map-ops.h> #include <linux/platform_data/x86/apple.h> #include <linux/pgtable.h> |