Merge branches 'acpi-tables', 'acpi-osl', 'acpi-misc' and 'acpi-tools'

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

diff --git a/drivers/acpi/acpi_configfs.c b/drivers/acpi/acpi_configfs.c
index f92033661239bea858d2a7288db062c2538f91a0..57d9d574d4dde6e448e83d12f3f66265fbc13398 100644 (file)
--- a/drivers/acpi/acpi_configfs.c
+++ b/drivers/acpi/acpi_configfs.c
@@ -1,11 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * ACPI configfs support
  *
  * Copyright (c) 2016 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
  */
 
 #define pr_fmt(fmt) "ACPI configfs: " fmt
@@ -56,11 +53,7 @@ static ssize_t acpi_table_aml_write(struct config_item *cfg,
        if (!table->header)
                return -ENOMEM;
 
-       ACPI_INFO(("Host-directed Dynamic ACPI Table Load:"));
-       ret = acpi_tb_install_and_load_table(
-                       ACPI_PTR_TO_PHYSADDR(table->header),
-                       ACPI_TABLE_ORIGIN_EXTERNAL_VIRTUAL, FALSE,
-                       &table->index);
+       ret = acpi_load_table(table->header);
        if (ret) {
                kfree(table->header);
                table->header = NULL;