Commit b2972f87 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown
Browse files

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: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 7f47fa6c
...@@ -47,7 +47,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias, ...@@ -47,7 +47,7 @@ static int create_modalias(struct acpi_device *acpi_dev, char *modalias,
int count; int count;
struct acpi_hardware_id *id; struct acpi_hardware_id *id;
if (!acpi_dev->flags.hardware_id && !acpi_dev->flags.compatible_ids) if (!acpi_dev->flags.hardware_id)
return -ENODEV; return -ENODEV;
len = snprintf(modalias, size, "acpi:"); len = snprintf(modalias, size, "acpi:");
...@@ -209,7 +209,7 @@ static int acpi_device_setup_files(struct acpi_device *dev) ...@@ -209,7 +209,7 @@ static int acpi_device_setup_files(struct acpi_device *dev)
goto end; 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); result = device_create_file(&dev->dev, &dev_attr_modalias);
if (result) if (result)
goto end; goto end;
...@@ -239,7 +239,7 @@ static void acpi_device_remove_files(struct acpi_device *dev) ...@@ -239,7 +239,7 @@ static void acpi_device_remove_files(struct acpi_device *dev)
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
device_remove_file(&dev->dev, &dev_attr_eject); 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); device_remove_file(&dev->dev, &dev_attr_modalias);
if (dev->flags.hardware_id) if (dev->flags.hardware_id)
...@@ -876,11 +876,6 @@ static int acpi_bus_get_flags(struct acpi_device *device) ...@@ -876,11 +876,6 @@ static int acpi_bus_get_flags(struct acpi_device *device)
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
device->flags.dynamic_status = 1; 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' */ /* Presence of _RMV indicates 'removable' */
status = acpi_get_handle(device->handle, "_RMV", &temp); status = acpi_get_handle(device->handle, "_RMV", &temp);
if (ACPI_SUCCESS(status)) if (ACPI_SUCCESS(status))
...@@ -1125,10 +1120,8 @@ static void acpi_device_set_id(struct acpi_device *device) ...@@ -1125,10 +1120,8 @@ static void acpi_device_set_id(struct acpi_device *device)
if (cid_list) if (cid_list)
for (i = 0; i < cid_list->count; i++) for (i = 0; i < cid_list->count; i++)
acpi_add_id(device, cid_list->ids[i].string); acpi_add_id(device, cid_list->ids[i].string);
if (cid_add) { if (cid_add)
acpi_add_id(device, cid_add); acpi_add_id(device, cid_add);
device->flags.compatible_ids = 1;
}
kfree(info); kfree(info);
} }
......
...@@ -142,7 +142,6 @@ struct acpi_device_status { ...@@ -142,7 +142,6 @@ struct acpi_device_status {
struct acpi_device_flags { struct acpi_device_flags {
u32 dynamic_status:1; u32 dynamic_status:1;
u32 hardware_id:1; u32 hardware_id:1;
u32 compatible_ids:1;
u32 bus_address:1; u32 bus_address:1;
u32 unique_id:1; u32 unique_id:1;
u32 removable:1; u32 removable:1;
...@@ -153,7 +152,7 @@ struct acpi_device_flags { ...@@ -153,7 +152,7 @@ struct acpi_device_flags {
u32 performance_manageable:1; u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */ u32 wake_capable:1; /* Wakeup(_PRW) supported? */
u32 force_power_state:1; u32 force_power_state:1;
u32 reserved:19; u32 reserved:20;
}; };
/* File System */ /* File System */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment