ACPI: remove acpi_device.flags.compatible_ids

We now keep a single list of IDs that includes both the _HID and any
_CIDs.  We no longer need to keep track of whether the device has a _CID.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 2e8889f62666b7a4f66e0c8c3259e644f716e0c7..395ae129aae0c4f91d59bc81848b3bad1f9f403a 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -47,7 +47,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
        int count;
        struct acpi_hardware_id *id;
 
-       if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids)
+       if (!acpi_dev->flags.hardware_id)
                return -ENODEV;
 
        len = snprintf(modalias, size, "acpi:");
@@ -209,7 +209,7 @@ static int acpi_device_setup_files(struct acpi_device *dev)
                        goto end;
        }
 
-       if (dev->flags.hardware_id || dev->flags.compatible_ids) {
+       if (dev->flags.hardware_id) {
                result = device_create_file(&dev->dev, &dev_attr_modalias);
                if (result)
                        goto end;
@@ -239,7 +239,7 @@ static void acpi_device_remove_files(struct acpi_device *dev)
        if (ACPI_SUCCESS(status))
                device_remove_file(&dev->dev, &dev_attr_eject);
 
-       if (dev->flags.hardware_id || dev->flags.compatible_ids)
+       if (dev->flags.hardware_id)
                device_remove_file(&dev->dev, &dev_attr_modalias);
 
        if (dev->flags.hardware_id)
@@ -876,11 +876,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
        if (ACPI_SUCCESS(status))
                device->flags.dynamic_status = 1;
 
-       /* Presence of _CID indicates 'compatible_ids' */
-       status = acpi_get_handle(device->handle, "_CID", &temp);
-       if (ACPI_SUCCESS(status))
-               device->flags.compatible_ids = 1;
-
        /* Presence of _RMV indicates 'removable' */
        status = acpi_get_handle(device->handle, "_RMV", &temp);
        if (ACPI_SUCCESS(status))
@@ -1125,10 +1120,8 @@ static void acpi_device_set_id(struct acpi_device *device)
        if (cid_list)
                for (i = 0; i < cid_list->count; i++)
                        acpi_add_id(device, cid_list->ids[i].string);
-       if (cid_add) {
+       if (cid_add)
                acpi_add_id(device, cid_add);
-               device->flags.compatible_ids = 1;
-       }
 
        kfree(info);
 }

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c2c434626edc0dde560a53011c6913e99cc8351d..0a970e4ade6f9e820f7d276975a550b874219a8b 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -142,7 +142,6 @@ struct acpi_device_status {
 struct acpi_device_flags {
        u32 dynamic_status:1;
        u32 hardware_id:1;
-       u32 compatible_ids:1;
        u32 bus_address:1;
        u32 unique_id:1;
        u32 removable:1;
@@ -153,7 +152,7 @@ struct acpi_device_flags {
        u32 performance_manageable:1;
        u32 wake_capable:1;     /* Wakeup(_PRW) supported? */
        u32 force_power_state:1;
-       u32 reserved:19;
+       u32 reserved:20;
 };
 
 /* File System */