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, 4 insertions, 4 deletions

diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index 119afda0968c..b3480cf7db1a 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -544,7 +544,7 @@ static int acpi_dev_pm_get_state(struct device *dev, struct acpi_device *adev,
  */
 int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p, int d_max_in)
 {
-        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        acpi_handle handle = ACPI_HANDLE(dev);
         struct acpi_device *adev;
         int ret, d_min, d_max;
 
@@ -652,7 +652,7 @@ int acpi_pm_device_run_wake(struct device *phys_dev, bool enable)
         if (!device_run_wake(phys_dev))
                 return -EINVAL;
 
-        handle = DEVICE_ACPI_HANDLE(phys_dev);
+        handle = ACPI_HANDLE(phys_dev);
         if (!handle || acpi_bus_get_device(handle, &adev)) {
                 dev_dbg(phys_dev, "ACPI handle without context in %s!\n",
                         __func__);
@@ -696,7 +696,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
         if (!device_can_wakeup(dev))
                 return -EINVAL;
 
-        handle = DEVICE_ACPI_HANDLE(dev);
+        handle = ACPI_HANDLE(dev);
         if (!handle || acpi_bus_get_device(handle, &adev)) {
                 dev_dbg(dev, "ACPI handle without context in %s!\n", __func__);
                 return -ENODEV;
@@ -718,7 +718,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
  */
 struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
 {
-        acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
+        acpi_handle handle = ACPI_HANDLE(dev);
         struct acpi_device *adev;
 
         return handle && !acpi_bus_get_device(handle, &adev) ? adev : NULL;