ACPI: sysfs: Get rid of ACPICA message printing

Replace the only ACPI_EXCEPTION() instance in sysfs.c with a
pr_warn() call, drop the _COMPONENT and ACPI_MODULE_NAME()
definitions that are not used any more and drop the
ACPI_SYSTEM_COMPONENT definition that would not be used any
more in a meaningful way after the above changes.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>

diff --git a/Documentation/firmware-guide/acpi/debug.rst b/Documentation/firmware-guide/acpi/debug.rst
index 0c979d8e45d700730c86aaf3ab6e4ad93816042a..6a6961c9d98a556f858785a8d4c4b330520ddda9 100644 (file)
--- a/Documentation/firmware-guide/acpi/debug.rst
+++ b/Documentation/firmware-guide/acpi/debug.rst
@@ -55,7 +55,6 @@ shows the supported mask values, currently these::
     ACPI_SBS_COMPONENT              0x00100000
     ACPI_FAN_COMPONENT              0x00200000
     ACPI_CONTAINER_COMPONENT        0x01000000
-    ACPI_SYSTEM_COMPONENT           0x02000000
     ACPI_MEMORY_DEVICE_COMPONENT    0x08000000
 
 debug_level

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index 4f27d782078485834f6813732bc6a0b4c76621fb..10f51490517dbcb59c9cc9ee86ef47b7ad05c554 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -12,9 +12,6 @@
 
 #include "internal.h"
 
-#define _COMPONENT             ACPI_SYSTEM_COMPONENT
-ACPI_MODULE_NAME("sysfs");
-
 #ifdef CONFIG_ACPI_DEBUG
 /*
  * ACPI debug sysfs I/F, including:
@@ -55,7 +52,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = {
        ACPI_DEBUG_INIT(ACPI_SBS_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_FAN_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_CONTAINER_COMPONENT),
-       ACPI_DEBUG_INIT(ACPI_SYSTEM_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_MEMORY_DEVICE_COMPONENT),
 };
 
@@ -650,8 +646,7 @@ static int get_status(u32 index, acpi_event_status *ret,
        if (index < num_gpes) {
                status = acpi_get_gpe_device(index, handle);
                if (ACPI_FAILURE(status)) {
-                       ACPI_EXCEPTION((AE_INFO, AE_NOT_FOUND,
-                                       "Invalid GPE 0x%x", index));
+                       pr_warn("Invalid GPE 0x%x", index);
                        return -ENXIO;
                }
                status = acpi_get_gpe_status(*handle, index, ret);

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 97e9a066417dd9e6a3f08d645da793985a365c68..b5bdb55e7defbbac6b84369d48f83dd5331ddaed 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -18,7 +18,6 @@
 #define ACPI_SBS_COMPONENT             0x00100000
 #define ACPI_FAN_COMPONENT             0x00200000
 #define ACPI_CONTAINER_COMPONENT       0x01000000
-#define ACPI_SYSTEM_COMPONENT          0x02000000
 #define ACPI_MEMORY_DEVICE_COMPONENT   0x08000000
 
 /*