diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2009-09-21 15:35:29 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-09-25 15:09:48 -0400 |
commit | 1131b938f0757350f569f8ad5bee737cd02b8e58 (patch) | |
tree | 679f4ff97f6858f18af7c86807644dc8144512f0 /include/acpi | |
parent | b2972f87508a21db7584d11fdb5c97cb7101a788 (diff) |
ACPI: remove acpi_device.flags.hardware_id
Every acpi_device has at least one ID (if there's no _HID or _CID, we
give it a synthetic or default ID). So there's no longer a need to
check whether an ID exists; we can just use it.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acpi_bus.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 0a970e4ade6f..6599b8cab45a 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -141,7 +141,6 @@ struct acpi_device_status { | |||
141 | 141 | ||
142 | struct acpi_device_flags { | 142 | struct acpi_device_flags { |
143 | u32 dynamic_status:1; | 143 | u32 dynamic_status:1; |
144 | u32 hardware_id:1; | ||
145 | u32 bus_address:1; | 144 | u32 bus_address:1; |
146 | u32 unique_id:1; | 145 | u32 unique_id:1; |
147 | u32 removable:1; | 146 | u32 removable:1; |
@@ -152,7 +151,7 @@ struct acpi_device_flags { | |||
152 | u32 performance_manageable:1; | 151 | u32 performance_manageable:1; |
153 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ | 152 | u32 wake_capable:1; /* Wakeup(_PRW) supported? */ |
154 | u32 force_power_state:1; | 153 | u32 force_power_state:1; |
155 | u32 reserved:20; | 154 | u32 reserved:21; |
156 | }; | 155 | }; |
157 | 156 | ||
158 | /* File System */ | 157 | /* File System */ |