ACPI: Eliminate the DEVICE_ACPI_HANDLE() macro

Since DEVICE_ACPI_HANDLE() is now literally identical to
ACPI_HANDLE(), replace it with the latter everywhere and drop its
definition from include/acpi.h.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pci/pci-label.c b/drivers/pci/pci-label.c
index edaed6f4da6c..d51f45aa669e 100644
--- a/drivers/pci/pci-label.c
+++ b/drivers/pci/pci-label.c
@@ -263,7 +263,7 @@ device_has_dsm(struct device *dev)
         acpi_handle handle;
         struct acpi_buffer output = {ACPI_ALLOCATE_BUFFER, NULL};
 
-        handle = DEVICE_ACPI_HANDLE(dev);
+        handle = ACPI_HANDLE(dev);
 
         if (!handle)
                 return FALSE;
@@ -295,7 +295,7 @@ acpilabel_show(struct device *dev, struct device_attribute *attr, char *buf)
         acpi_handle handle;
         int length;
 
-        handle = DEVICE_ACPI_HANDLE(dev);
+        handle = ACPI_HANDLE(dev);
 
         if (!handle)
                 return -1;
@@ -316,7 +316,7 @@ acpiindex_show(struct device *dev, struct device_attribute *attr, char *buf)
         acpi_handle handle;
         int length;
 
-        handle = DEVICE_ACPI_HANDLE(dev);
+        handle = ACPI_HANDLE(dev);
 
         if (!handle)
                 return -1;