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>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index eb54f98bb728b680e63901c7c84c10c867311a0f..e3aed481aed2724d67608c85db95cda2295a6b05 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -494,7 +494,7 @@ static int acpi_bus_match(struct device *dev, struct device_driver *drv)
        struct acpi_device *acpi_dev = to_acpi_device(dev);
        struct acpi_driver *acpi_drv = to_acpi_driver(drv);
 
-       return acpi_dev->add_type >= ACPI_BUS_ADD_MATCH
+       return acpi_dev->flags.match_driver
                && !acpi_match_device_ids(acpi_dev, acpi_drv->ids);
 }
 
@@ -1410,8 +1410,7 @@ static void acpi_hot_add_bind(struct acpi_device *device)
 
 static int acpi_add_single_object(struct acpi_device **child,
                                  acpi_handle handle, int type,
-                                 unsigned long long sta,
-                                 enum acpi_bus_add_type add_type)
+                                 unsigned long long sta, bool match_driver)
 {
        int result;
        struct acpi_device *device;
@@ -1427,7 +1426,6 @@ static int acpi_add_single_object(struct acpi_device **child,
        device->device_type = type;
        device->handle = handle;
        device->parent = acpi_bus_get_parent(handle);
-       device->add_type = add_type;
        STRUCT_TO_INT(device->status) = sta;
 
        acpi_device_get_busid(device);
@@ -1478,9 +1476,10 @@ static int acpi_add_single_object(struct acpi_device **child,
        if ((result = acpi_device_set_context(device)))
                goto end;
 
+       device->flags.match_driver = match_driver;
        result = acpi_device_register(device);
 
-       if (device->add_type >= ACPI_BUS_ADD_MATCH)
+       if (device->flags.match_driver)
                acpi_hot_add_bind(device);
 
 end:
@@ -1509,7 +1508,7 @@ static void acpi_bus_add_power_resource(acpi_handle handle)
        acpi_bus_get_device(handle, &device);
        if (!device)
                acpi_add_single_object(&device, handle, ACPI_BUS_TYPE_POWER,
-                                       ACPI_STA_DEFAULT, ACPI_BUS_ADD_START);
+                                       ACPI_STA_DEFAULT, true);
 }
 
 static int acpi_bus_type_and_status(acpi_handle handle, int *type,
@@ -1580,11 +1579,11 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl_not_used,
                return AE_CTRL_DEPTH;
        }
 
-       acpi_add_single_object(&device, handle, type, sta, ACPI_BUS_ADD_BASIC);
+       acpi_add_single_object(&device, handle, type, sta, false);
        if (!device)
                return AE_CTRL_DEPTH;
 
-       device->add_type = ACPI_BUS_ADD_START;
+       device->flags.match_driver = true;
        acpi_hot_add_bind(device);
 
  out:
@@ -1749,16 +1748,14 @@ static int acpi_bus_scan_fixed(void)
        if ((acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON) == 0) {
                result = acpi_add_single_object(&device, NULL,
                                                ACPI_BUS_TYPE_POWER_BUTTON,
-                                               ACPI_STA_DEFAULT,
-                                               ACPI_BUS_ADD_START);
+                                               ACPI_STA_DEFAULT, true);
                device_init_wakeup(&device->dev, true);
        }
 
        if ((acpi_gbl_FADT.flags & ACPI_FADT_SLEEP_BUTTON) == 0) {
                result = acpi_add_single_object(&device, NULL,
                                                ACPI_BUS_TYPE_SLEEP_BUTTON,
-                                               ACPI_STA_DEFAULT,
-                                               ACPI_BUS_ADD_START);
+                                               ACPI_STA_DEFAULT, true);
        }
 
        return result;

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 75c6b3f2250dbc117bbf17ff254666bb5220aa45..056cb0cd8effac9659067ee5081e1ea5f01704db 100644 (file)
--- 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;