ACPI: Replace ACPI device add_type field with a match_driver flag

After the removal of the second argument of acpi_bus_scan() there is
no difference between the ACPI_BUS_ADD_MATCH and ACPI_BUS_ADD_START
add types, so the add_type field in struct acpi_device may be
replaced with a single flag.  Do that calling the flag match_driver.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>

1 files changed, 2 insertions, 9 deletions

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 75c6b3f2250d..056cb0cd8eff 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -63,13 +63,6 @@ acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld
 #define ACPI_BUS_FILE_ROOT      "acpi"
 extern struct proc_dir_entry *acpi_root_dir;
 
-enum acpi_bus_add_type {
-        ACPI_BUS_ADD_BASIC = 0,
-        ACPI_BUS_ADD_MATCH,
-        ACPI_BUS_ADD_START,
-        ACPI_BUS_ADD_TYPE_COUNT
-};
-
 enum acpi_bus_removal_type {
         ACPI_BUS_REMOVAL_NORMAL = 0,
         ACPI_BUS_REMOVAL_EJECT,
@@ -150,7 +143,8 @@ struct acpi_device_flags {
         u32 power_manageable:1;
         u32 performance_manageable:1;
         u32 eject_pending:1;
-        u32 reserved:24;
+        u32 match_driver:1;
+        u32 reserved:23;
 };
 
 /* File System */
@@ -285,7 +279,6 @@ struct acpi_device {
         struct acpi_driver *driver;
         void *driver_data;
         struct device dev;
-        enum acpi_bus_add_type add_type;        /* how to handle adding */
         enum acpi_bus_removal_type removal_type;        /* indicate for different removal type */
         u8 physical_node_count;
         struct list_head physical_node_list;