6 files changed, 45 insertions, 110 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index ee26bac2d378..cd929aed3613 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -494,7 +494,7 @@ static void acpiphp_bus_add(acpi_handle handle)
 
         acpi_bus_scan(handle);
         acpi_bus_get_device(handle, &adev);
-        if (adev)
+        if (acpi_device_enumerated(adev))
                 acpi_device_set_power(adev, ACPI_STATE_D0);
 }
 
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
index ecfac7e72d91..8dcccffd6e21 100644
--- a/drivers/pci/hotplug/acpiphp_ibm.c
+++ b/drivers/pci/hotplug/acpiphp_ibm.c
@@ -31,12 +31,11 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <acpi/acpi_bus.h>
 #include <linux/sysfs.h>
 #include <linux/kobject.h>
-#include <asm/uaccess.h>
 #include <linux/moduleparam.h>
 #include <linux/pci.h>
+#include <asm/uaccess.h>
 
 #include "acpiphp.h"
 #include "../pci.h"
diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index ccb0925bcd7b..88b37cad4b35 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -162,8 +162,6 @@ static inline const char *slot_name(struct slot *slot)
 }
 
 #ifdef CONFIG_ACPI
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
 #include <linux/pci-acpi.h>
 
 void __init pciehp_acpi_slot_detection_init(void);
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 2c2930ea06ad..6b2b7dddbbdb 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/acpi.h>
 #include <linux/slab.h>
-#include <acpi/acpi_bus.h>
 
 struct ioapic {
         acpi_handle     handle;
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index 2bdbc0080204..f49abef88485 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -12,9 +12,6 @@
 #include <linux/pci.h>
 #include <linux/module.h>
 #include <linux/pci-aspm.h>
-#include <acpi/acpi.h>
-#include <acpi/acpi_bus.h>
-
 #include <linux/pci-acpi.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_qos.h>
@@ -306,10 +303,10 @@ void acpi_pci_remove_bus(struct pci_bus *bus)
 }
 
 /* ACPI bus type */
-static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
+static struct acpi_device *acpi_pci_find_companion(struct device *dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(dev);
-        bool is_bridge;
+        bool check_children;
         u64 addr;
 
         /*
@@ -317,14 +314,12 @@ static int acpi_pci_find_device(struct device *dev, acpi_handle *handle)
          * is set only after acpi_pci_find_device() has been called for the
          * given device.
          */
-        is_bridge = pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE
+        check_children = pci_dev->hdr_type == PCI_HEADER_TYPE_BRIDGE
                         || pci_dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;
         /* Please ref to ACPI spec for the syntax of _ADR */
         addr = (PCI_SLOT(pci_dev->devfn) << 16) | PCI_FUNC(pci_dev->devfn);
-        *handle = acpi_find_child(ACPI_HANDLE(dev->parent), addr, is_bridge);
-        if (!*handle)
-                return -ENODEV;
-        return 0;
+        return acpi_find_child_device(ACPI_COMPANION(dev->parent), addr,
+                                      check_children);
 }
 
 static void pci_acpi_setup(struct device *dev)
@@ -367,7 +362,7 @@ static bool pci_acpi_bus_match(struct device *dev)
 static struct acpi_bus_type acpi_pci_bus = {
         .name = "PCI",
         .match = pci_acpi_bus_match,
-        .find_device = acpi_pci_find_device,
+        .find_companion = acpi_pci_find_companion,
         .setup = pci_acpi_setup,
         .cleanup = pci_acpi_cleanup,
 };
diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index 6f5d343d251c..45113daaa778 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -29,7 +29,6 @@
 #include <linux/nls.h>
 #include <linux/acpi.h>
 #include <linux/pci-acpi.h>
-#include <acpi/acpi_bus.h>
 #include "pci.h"
 
 #define DEVICE_LABEL_DSM        0x07
@@ -162,7 +161,6 @@ static const char device_label_dsm_uuid[] = {
 };
 
 enum acpi_attr_enum {
-        ACPI_ATTR_NONE = 0,
         ACPI_ATTR_LABEL_SHOW,
         ACPI_ATTR_INDEX_SHOW,
 };
@@ -170,84 +168,61 @@ enum acpi_attr_enum {
 static void dsm_label_utf16s_to_utf8s(union acpi_object *obj, char *buf)
 {
         int len;
-        len = utf16s_to_utf8s((const wchar_t *)obj->
-                              package.elements[1].string.pointer,
-                              obj->package.elements[1].string.length,
+        len = utf16s_to_utf8s((const wchar_t *)obj->string.pointer,
+                              obj->string.length,
                               UTF16_LITTLE_ENDIAN,
                               buf, PAGE_SIZE);
         buf[len] = '\n';
 }
 
 static int
-dsm_get_label(acpi_handle handle, int func,
-              struct acpi_buffer *output,
-              char *buf, enum acpi_attr_enum attribute)
+dsm_get_label(struct device *dev, char *buf, enum acpi_attr_enum attr)
 {
-        struct acpi_object_list input;
-        union acpi_object params[4];
-        union acpi_object *obj;
-        int len = 0;
-
-        int err;
-
-        input.count = 4;
-        input.pointer = params;
-        params[0].type = ACPI_TYPE_BUFFER;
-        params[0].buffer.length = sizeof(device_label_dsm_uuid);
-        params[0].buffer.pointer = (char *)device_label_dsm_uuid;
-        params[1].type = ACPI_TYPE_INTEGER;
-        params[1].integer.value = 0x02;
-        params[2].type = ACPI_TYPE_INTEGER;
-        params[2].integer.value = func;
-        params[3].type = ACPI_TYPE_PACKAGE;
-        params[3].package.count = 0;
-        params[3].package.elements = NULL;
-
-        err = acpi_evaluate_object(handle, "_DSM", &input, output);
-        if (err)
+        acpi_handle handle;
+        union acpi_object *obj, *tmp;
+        int len = -1;
+
+        handle = ACPI_HANDLE(dev);
+        if (!handle)
                 return -1;
 
-        obj = (union acpi_object *)output->pointer;
-
-        switch (obj->type) {
-        case ACPI_TYPE_PACKAGE:
-                if (obj->package.count != 2)
-                        break;
-                len = obj->package.elements[0].integer.value;
-                if (buf) {
-                        if (attribute == ACPI_ATTR_INDEX_SHOW)
-                                scnprintf(buf, PAGE_SIZE, "%llu\n",
-                                obj->package.elements[0].integer.value);
-                        else if (attribute == ACPI_ATTR_LABEL_SHOW)
-                                dsm_label_utf16s_to_utf8s(obj, buf);
-                        kfree(output->pointer);
-                        return strlen(buf);
-                }
-                kfree(output->pointer);
-                return len;
-        break;
-        default:
-                kfree(output->pointer);
+        obj = acpi_evaluate_dsm(handle, device_label_dsm_uuid, 0x2,
+                                DEVICE_LABEL_DSM, NULL);
+        if (!obj)
+                return -1;
+
+        tmp = obj->package.elements;
+        if (obj->type == ACPI_TYPE_PACKAGE && obj->package.count == 2 &&
+            tmp[0].type == ACPI_TYPE_INTEGER &&
+            tmp[1].type == ACPI_TYPE_STRING) {
+                /*
+                 * The second string element is optional even when
+                 * this _DSM is implemented; when not implemented,
+                 * this entry must return a null string.
+                 */
+                if (attr == ACPI_ATTR_INDEX_SHOW)
+                        scnprintf(buf, PAGE_SIZE, "%llu\n", tmp->integer.value);
+                else if (attr == ACPI_ATTR_LABEL_SHOW)
+                        dsm_label_utf16s_to_utf8s(tmp + 1, buf);
+                len = strlen(buf) > 0 ? strlen(buf) : -1;
         }
-        return -1;
+
+        ACPI_FREE(obj);
+
+        return len;
 }
 
 static bool
 device_has_dsm(struct device *dev)
 {
         acpi_handle handle;
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
 
         handle = ACPI_HANDLE(dev);
-
         if (!handle)
-                return FALSE;
+                return false;
 
-        if (dsm_get_label(handle, DEVICE_LABEL_DSM, &output, NULL,
-                          ACPI_ATTR_NONE) > 0)
-                return TRUE;
-
-        return FALSE;
+        return !!acpi_check_dsm(handle, device_label_dsm_uuid, 0x2,
+                                1 << DEVICE_LABEL_DSM);
 }
 
 static umode_t
@@ -266,44 +241,13 @@ acpi_index_string_exist(struct kobject *kobj, struct attribute *attr, int n)
 static ssize_t
 acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_handle handle;
-        int length;
-
-        handle = ACPI_HANDLE(dev);
-
-        if (!handle)
-                return -1;
-
-        length = dsm_get_label(handle, DEVICE_LABEL_DSM,
-                               &output, buf, ACPI_ATTR_LABEL_SHOW);
-
-        if (length < 1)
-                return -1;
-
-        return length;
+        return dsm_get_label(dev, buf, ACPI_ATTR_LABEL_SHOW);
 }
 
 static ssize_t
 acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf)
 {
-        struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
-        acpi_handle handle;
-        int length;
-
-        handle = ACPI_HANDLE(dev);
-
-        if (!handle)
-                return -1;
-
-        length = dsm_get_label(handle, DEVICE_LABEL_DSM,
-                               &output, buf, ACPI_ATTR_INDEX_SHOW);
-
-        if (length < 0)
-                return -1;
-
-        return length;
-
+        return dsm_get_label(dev, buf, ACPI_ATTR_INDEX_SHOW);
 }
 
 static struct device_attribute acpi_attr_label = {