aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-09-21 13:35:35 -0600
committerLen Brown <len.brown@intel.com>2009-09-25 15:09:49 -0400
commit6622d8cee73a26bce958484065c8f0e704911a62 (patch)
tree6f10a1294a03c25038a394f4211e83e122b039ae
parent1131b938f0757350f569f8ad5bee737cd02b8e58 (diff)
downloadlinux-linaro-6622d8cee73a26bce958484065c8f0e704911a62.tar.gz
ACPI: remove acpi_device_uid() and related stuff
Nobody uses acpi_device_uid(), so this patch removes it. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/scan.c18
-rw-r--r--include/acpi/acpi_bus.h4
2 files changed, 1 insertions, 21 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 7e031b90c09..da11b5379dc 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1018,7 +1018,6 @@ static void acpi_device_set_id(struct acpi_device *device)
{
struct acpi_device_info *info = NULL;
char *hid = NULL;
- char *uid = NULL;
struct acpica_device_id_list *cid_list = NULL;
char *cid_add = NULL;
acpi_status status;
@@ -1045,8 +1044,6 @@ static void acpi_device_set_id(struct acpi_device *device)
if (info->valid & ACPI_VALID_HID)
hid = info->hardware_id.string;
- if (info->valid & ACPI_VALID_UID)
- uid = info->unique_id.string;
if (info->valid & ACPI_VALID_CID)
cid_list = &info->compatible_id_list;
if (info->valid & ACPI_VALID_ADR) {
@@ -1096,16 +1093,6 @@ static void acpi_device_set_id(struct acpi_device *device)
if (hid)
acpi_add_id(device, hid);
- if (uid) {
- device->pnp.unique_id = ACPI_ALLOCATE_ZEROED(strlen (uid) + 1);
- if (device->pnp.unique_id) {
- strcpy(device->pnp.unique_id, uid);
- device->flags.unique_id = 1;
- }
- }
- if (!device->flags.unique_id)
- device->pnp.unique_id = "";
-
if (cid_list)
for (i = 0; i < cid_list->count; i++)
acpi_add_id(device, cid_list->ids[i].string);
@@ -1200,11 +1187,6 @@ static int acpi_add_single_object(struct acpi_device **child,
* -----------------
* TBD: Synch with Core's enumeration/initialization process.
*/
-
- /*
- * Hardware ID, Unique ID, & Bus Address
- * -------------------------------------
- */
acpi_device_set_id(device);
/*
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 6599b8cab45..3cd9ccdcbd8 100644
--- 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 bus_address:1;
- u32 unique_id:1;
u32 removable:1;
u32 ejectable:1;
u32 lockable:1;
@@ -151,7 +150,7 @@ struct acpi_device_flags {
u32 performance_manageable:1;
u32 wake_capable:1; /* Wakeup(_PRW) supported? */
u32 force_power_state:1;
- u32 reserved:21;
+ u32 reserved:22;
};
/* File System */
@@ -186,7 +185,6 @@ struct acpi_device_pnp {
#define acpi_device_bid(d) ((d)->pnp.bus_id)
#define acpi_device_adr(d) ((d)->pnp.bus_address)
char *acpi_device_hid(struct acpi_device *device);
-#define acpi_device_uid(d) ((d)->pnp.unique_id)
#define acpi_device_name(d) ((d)->pnp.device_name)
#define acpi_device_class(d) ((d)->pnp.device_class)