mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
ACPI: remove acpi_device_uid() and related stuff
Nobody uses acpi_device_uid(), so this patch removes it. Signed-off-by: Bjorn Helgaas <[email protected]> Signed-off-by: Len Brown <[email protected]>
This commit is contained in:
parent
1131b938f0
commit
6622d8cee7
2 changed files with 1 additions and 21 deletions
|
|
@ -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);
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Reference in a new issue