1 files changed, 87 insertions, 17 deletions

diff --git a/drivers/acpi/acpica/utids.c b/drivers/acpi/acpica/utids.c
index 5d84e1954575..774c3aefbf5d 100644
--- a/drivers/acpi/acpica/utids.c
+++ b/drivers/acpi/acpica/utids.c
@@ -67,10 +67,10 @@ ACPI_MODULE_NAME("utids")
  ******************************************************************************/
 acpi_status
 acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id)
+                    struct acpi_pnp_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id *hid;
+        struct acpi_pnp_device_id *hid;
         u32 length;
         acpi_status status;
 
@@ -94,16 +94,17 @@ acpi_ut_execute_HID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the HID */
 
         hid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
                                  (acpi_size) length);
         if (!hid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after DEVICE_ID struct */
+        /* Area for the string starts after PNP_DEVICE_ID struct */
 
-        hid->string = ACPI_ADD_PTR(char, hid, sizeof(struct acpica_device_id));
+        hid->string =
+            ACPI_ADD_PTR(char, hid, sizeof(struct acpi_pnp_device_id));
 
         /* Convert EISAID to a string or simply copy existing string */
 
@@ -126,6 +127,73 @@ cleanup:
 
 /*******************************************************************************
  *
+ * FUNCTION:    acpi_ut_execute_SUB
+ *
+ * PARAMETERS:  device_node         - Node for the device
+ *              return_id           - Where the _SUB is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Executes the _SUB control method that returns the subsystem
+ *              ID of the device. The _SUB value is always a string containing
+ *              either a valid PNP or ACPI ID.
+ *
+ *              NOTE: Internal function, no parameter validation
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_execute_SUB(struct acpi_namespace_node *device_node,
+                    struct acpi_pnp_device_id **return_id)
+{
+        union acpi_operand_object *obj_desc;
+        struct acpi_pnp_device_id *sub;
+        u32 length;
+        acpi_status status;
+
+        ACPI_FUNCTION_TRACE(ut_execute_SUB);
+
+        status = acpi_ut_evaluate_object(device_node, METHOD_NAME__SUB,
+                                         ACPI_BTYPE_STRING, &obj_desc);
+        if (ACPI_FAILURE(status)) {
+                return_ACPI_STATUS(status);
+        }
+
+        /* Get the size of the String to be returned, includes null terminator */
+
+        length = obj_desc->string.length + 1;
+
+        /* Allocate a buffer for the SUB */
+
+        sub =
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
+                                 (acpi_size) length);
+        if (!sub) {
+                status = AE_NO_MEMORY;
+                goto cleanup;
+        }
+
+        /* Area for the string starts after PNP_DEVICE_ID struct */
+
+        sub->string =
+            ACPI_ADD_PTR(char, sub, sizeof(struct acpi_pnp_device_id));
+
+        /* Simply copy existing string */
+
+        ACPI_STRCPY(sub->string, obj_desc->string.pointer);
+        sub->length = length;
+        *return_id = sub;
+
+      cleanup:
+
+        /* On exit, we must delete the return object */
+
+        acpi_ut_remove_reference(obj_desc);
+        return_ACPI_STATUS(status);
+}
+
+/*******************************************************************************
+ *
  * FUNCTION:    acpi_ut_execute_UID
  *
  * PARAMETERS:  device_node         - Node for the device
@@ -144,10 +212,10 @@ cleanup:
 
 acpi_status
 acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id **return_id)
+                    struct acpi_pnp_device_id **return_id)
 {
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id *uid;
+        struct acpi_pnp_device_id *uid;
         u32 length;
         acpi_status status;
 
@@ -171,16 +239,17 @@ acpi_ut_execute_UID(struct acpi_namespace_node *device_node,
         /* Allocate a buffer for the UID */
 
         uid =
-            ACPI_ALLOCATE_ZEROED(sizeof(struct acpica_device_id) +
+            ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_pnp_device_id) +
                                  (acpi_size) length);
         if (!uid) {
                 status = AE_NO_MEMORY;
                 goto cleanup;
         }
 
-        /* Area for the string starts after DEVICE_ID struct */
+        /* Area for the string starts after PNP_DEVICE_ID struct */
 
-        uid->string = ACPI_ADD_PTR(char, uid, sizeof(struct acpica_device_id));
+        uid->string =
+            ACPI_ADD_PTR(char, uid, sizeof(struct acpi_pnp_device_id));
 
         /* Convert an Integer to string, or just copy an existing string */
 
@@ -226,11 +295,11 @@ cleanup:
 
 acpi_status
 acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
-                    struct acpica_device_id_list **return_cid_list)
+                    struct acpi_pnp_device_id_list **return_cid_list)
 {
         union acpi_operand_object **cid_objects;
         union acpi_operand_object *obj_desc;
-        struct acpica_device_id_list *cid_list;
+        struct acpi_pnp_device_id_list *cid_list;
         char *next_id_string;
         u32 string_area_size;
         u32 length;
@@ -288,11 +357,12 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
         /*
          * Now that we know the length of the CIDs, allocate return buffer:
          * 1) Size of the base structure +
-         * 2) Size of the CID DEVICE_ID array +
+         * 2) Size of the CID PNP_DEVICE_ID array +
          * 3) Size of the actual CID strings
          */
-        cid_list_size = sizeof(struct acpica_device_id_list) +
-            ((count - 1) * sizeof(struct acpica_device_id)) + string_area_size;
+        cid_list_size = sizeof(struct acpi_pnp_device_id_list) +
+            ((count - 1) * sizeof(struct acpi_pnp_device_id)) +
+            string_area_size;
 
         cid_list = ACPI_ALLOCATE_ZEROED(cid_list_size);
         if (!cid_list) {
@@ -300,10 +370,10 @@ acpi_ut_execute_CID(struct acpi_namespace_node *device_node,
                 goto cleanup;
         }
 
-        /* Area for CID strings starts after the CID DEVICE_ID array */
+        /* Area for CID strings starts after the CID PNP_DEVICE_ID array */
 
         next_id_string = ACPI_CAST_PTR(char, cid_list->ids) +
-            ((acpi_size) count * sizeof(struct acpica_device_id));
+            ((acpi_size) count * sizeof(struct acpi_pnp_device_id));
 
         /* Copy/convert the CIDs to the return buffer */