ACPI: bus: Drop ACPI_BUS_COMPONENT which is not used any more

After dropping all of the code using ACPI_BUS_COMPONENT drop it
too and modify the example in the documentation using it.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/Documentation/firmware-guide/acpi/debug.rst b/Documentation/firmware-guide/acpi/debug.rst
index 73f88a27f12b5b48db281d2a8481d3e5a0727408..c7bad74c6ff7998a8d075ff80e7b606b4fed0a54 100644 (file)
--- a/Documentation/firmware-guide/acpi/debug.rst
+++ b/Documentation/firmware-guide/acpi/debug.rst
@@ -52,7 +52,6 @@ shows the supported mask values, currently these::
     ACPI_CA_DISASSEMBLER            0x00000800
     ACPI_COMPILER                   0x00001000
     ACPI_TOOLS                      0x00002000
-    ACPI_BUS_COMPONENT              0x00010000
     ACPI_AC_COMPONENT               0x00020000
     ACPI_BATTERY_COMPONENT          0x00040000
     ACPI_BUTTON_COMPONENT           0x00080000
@@ -117,15 +116,15 @@ currently these::
 Examples
 ========
 
-For example, drivers/acpi/bus.c contains this::
+For example, drivers/acpi/acpica/evxfevnt.c contains this::
 
-    #define _COMPONENT              ACPI_BUS_COMPONENT
+    #define _COMPONENT          ACPI_EVENTS
     ...
-    ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n"));
+    ACPI_DEBUG_PRINT((ACPI_DB_INIT, "ACPI mode disabled\n"));
 
-To turn on this message, set the ACPI_BUS_COMPONENT bit in acpi.debug_layer
-and the ACPI_LV_INFO bit in acpi.debug_level.  (The ACPI_DEBUG_PRINT
-statement uses ACPI_DB_INFO, which is macro based on the ACPI_LV_INFO
+To turn on this message, set the ACPI_EVENTS bit in acpi.debug_layer
+and the ACPI_LV_INIT bit in acpi.debug_level.  (The ACPI_DEBUG_PRINT
+statement uses ACPI_DB_INIT, which is a macro based on the ACPI_LV_INIT
 definition.)
 
 Enable all AML "Debug" output (stores to the Debug object while interpreting

diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
index eeb0419d68a8b9fd13fe4ec1772c1ff7ccccdf83..b065f2af882191e18af000a82127910bcf6c2315 100644 (file)
--- a/drivers/acpi/sysfs.c
+++ b/drivers/acpi/sysfs.c
@@ -52,7 +52,6 @@ static const struct acpi_dlayer acpi_debug_layers[] = {
        ACPI_DEBUG_INIT(ACPI_COMPILER),
        ACPI_DEBUG_INIT(ACPI_TOOLS),
 
-       ACPI_DEBUG_INIT(ACPI_BUS_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_AC_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_BATTERY_COMPONENT),
        ACPI_DEBUG_INIT(ACPI_BUTTON_COMPONENT),

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index 14da491bad966785af2787ea48c2c8a13d8d4b5c..4baa7a7dc83a3f9ed2be6d937a827789c28ca35f 100644 (file)
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -15,7 +15,6 @@
  * Please update drivers/acpi/debug.c and Documentation/firmware-guide/acpi/debug.rst
  * if you add to this list.
  */
-#define ACPI_BUS_COMPONENT             0x00010000
 #define ACPI_AC_COMPONENT              0x00020000
 #define ACPI_BATTERY_COMPONENT         0x00040000
 #define ACPI_BUTTON_COMPONENT          0x00080000