Commit 6622d8ce authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

ACPI: remove acpi_device_uid() and related stuff

Nobody uses acpi_device_uid(), so this patch removes it.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 1131b938
...@@ -1018,7 +1018,6 @@ static void acpi_device_set_id(struct acpi_device *device) ...@@ -1018,7 +1018,6 @@ static void acpi_device_set_id(struct acpi_device *device)
{ {
struct acpi_device_info *info = NULL; struct acpi_device_info *info = NULL;
char *hid = NULL; char *hid = NULL;
char *uid = NULL;
struct acpica_device_id_list *cid_list = NULL; struct acpica_device_id_list *cid_list = NULL;
char *cid_add = NULL; char *cid_add = NULL;
acpi_status status; acpi_status status;
...@@ -1045,8 +1044,6 @@ static void acpi_device_set_id(struct acpi_device *device) ...@@ -1045,8 +1044,6 @@ static void acpi_device_set_id(struct acpi_device *device)
if (info->valid & ACPI_VALID_HID) if (info->valid & ACPI_VALID_HID)
hid = info->hardware_id.string; hid = info->hardware_id.string;
if (info->valid & ACPI_VALID_UID)
uid = info->unique_id.string;
if (info->valid & ACPI_VALID_CID) if (info->valid & ACPI_VALID_CID)
cid_list = &info->compatible_id_list; cid_list = &info->compatible_id_list;
if (info->valid & ACPI_VALID_ADR) { if (info->valid & ACPI_VALID_ADR) {
...@@ -1096,16 +1093,6 @@ static void acpi_device_set_id(struct acpi_device *device) ...@@ -1096,16 +1093,6 @@ static void acpi_device_set_id(struct acpi_device *device)
if (hid) if (hid)
acpi_add_id(device, 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) 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);
...@@ -1200,11 +1187,6 @@ static int acpi_add_single_object(struct acpi_device **child, ...@@ -1200,11 +1187,6 @@ static int acpi_add_single_object(struct acpi_device **child,
* ----------------- * -----------------
* TBD: Synch with Core's enumeration/initialization process. * TBD: Synch with Core's enumeration/initialization process.
*/ */
/*
* Hardware ID, Unique ID, & Bus Address
* -------------------------------------
*/
acpi_device_set_id(device); acpi_device_set_id(device);
/* /*
......
...@@ -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 bus_address:1; u32 bus_address:1;
u32 unique_id:1;
u32 removable:1; u32 removable:1;
u32 ejectable:1; u32 ejectable:1;
u32 lockable:1; u32 lockable:1;
...@@ -151,7 +150,7 @@ struct acpi_device_flags { ...@@ -151,7 +150,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:21; u32 reserved:22;
}; };
/* File System */ /* File System */
...@@ -186,7 +185,6 @@ struct acpi_device_pnp { ...@@ -186,7 +185,6 @@ struct acpi_device_pnp {
#define acpi_device_bid(d) ((d)->pnp.bus_id) #define acpi_device_bid(d) ((d)->pnp.bus_id)
#define acpi_device_adr(d) ((d)->pnp.bus_address) #define acpi_device_adr(d) ((d)->pnp.bus_address)
char *acpi_device_hid(struct acpi_device *device); 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_name(d) ((d)->pnp.device_name)
#define acpi_device_class(d) ((d)->pnp.device_class) #define acpi_device_class(d) ((d)->pnp.device_class)
......
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