summaryrefslogtreecommitdiffstats
path: root/drivers/mailbox
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-12-22 13:19:32 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-12-22 13:19:32 -0500
commit9be962d5258ebb5a0f1edd3ede26bfd847c4ebe6 (patch)
tree5b3f48e07afb0b12876f4363d5a2cc98534d7194 /drivers/mailbox
parent85ba70b6ceff7a2880f29b94e789cee436bc572f (diff)
parentc8e008e2a6f9ec007a0e22e18eeb5bace5bf16c8 (diff)
Merge tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI updates from Rafael Wysocki: "Here are new versions of two ACPICA changes that were deferred previously due to a problem they had introduced, two cleanups on top of them and the removal of a useless warning message from the ACPI core. Specifics: - Move some Linux-specific functionality to upstream ACPICA and update the in-kernel users of it accordingly (Lv Zheng) - Drop a useless warning (triggered by the lack of an optional object) from the ACPI namespace scanning code (Zhang Rui)" * tag 'acpi-extra-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / osl: Remove deprecated acpi_get_table_with_size()/early_acpi_os_unmap_memory() ACPI / osl: Remove acpi_get_table_with_size()/early_acpi_os_unmap_memory() users ACPICA: Tables: Allow FADT to be customized with virtual address ACPICA: Tables: Back port acpi_get_table_with_size() and early_acpi_os_unmap_memory() from Linux kernel ACPI: do not warn if _BQC does not exist
Diffstat (limited to 'drivers/mailbox')
-rw-r--r--drivers/mailbox/pcc.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/mailbox/pcc.c b/drivers/mailbox/pcc.c
index 1f32688c312d..dd9ecd354a3e 100644
--- a/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@ -447,7 +447,6 @@ static int pcc_parse_subspace_irq(int id,
447 */ 447 */
448static int __init acpi_pcc_probe(void) 448static int __init acpi_pcc_probe(void)
449{ 449{
450 acpi_size pcct_tbl_header_size;
451 struct acpi_table_header *pcct_tbl; 450 struct acpi_table_header *pcct_tbl;
452 struct acpi_subtable_header *pcct_entry; 451 struct acpi_subtable_header *pcct_entry;
453 struct acpi_table_pcct *acpi_pcct_tbl; 452 struct acpi_table_pcct *acpi_pcct_tbl;
@@ -456,9 +455,7 @@ static int __init acpi_pcc_probe(void)
456 acpi_status status = AE_OK; 455 acpi_status status = AE_OK;
457 456
458 /* Search for PCCT */ 457 /* Search for PCCT */
459 status = acpi_get_table_with_size(ACPI_SIG_PCCT, 0, 458 status = acpi_get_table(ACPI_SIG_PCCT, 0, &pcct_tbl);
460 &pcct_tbl,
461 &pcct_tbl_header_size);
462 459
463 if (ACPI_FAILURE(status) || !pcct_tbl) { 460 if (ACPI_FAILURE(status) || !pcct_tbl) {
464 pr_warn("PCCT header not found.\n"); 461 pr_warn("PCCT header not found.\n");