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>

5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c
index 1ce8ee054f1a..a94d850ae228 100644
--- a/drivers/pci/hotplug/acpi_pcihp.c
+++ b/drivers/pci/hotplug/acpi_pcihp.c
@@ -367,7 +367,7 @@ int acpi_get_hp_hw_control_from_firmware(struct pci_dev *pdev, u32 flags)
                 string = (struct acpi_buffer){ ACPI_ALLOCATE_BUFFER, NULL };
         }
 
-        handle = DEVICE_ACPI_HANDLE(&pdev->dev);
+        handle = ACPI_HANDLE(&pdev->dev);
         if (!handle) {
                 /*
                  * This hotplug controller was not listed in the ACPI name
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c
index ead7c534095e..cff7cadfc2e4 100644
--- a/drivers/pci/hotplug/pciehp_acpi.c
+++ b/drivers/pci/hotplug/pciehp_acpi.c
@@ -54,7 +54,7 @@ int pciehp_acpi_slot_detection_check(struct pci_dev *dev)
 {
         if (slot_detection_mode != PCIEHP_DETECT_ACPI)
                 return 0;
-        if (acpi_pci_detect_ejectable(DEVICE_ACPI_HANDLE(&dev->dev)))
+        if (acpi_pci_detect_ejectable(ACPI_HANDLE(&dev->dev)))
                 return 0;
         return -ENODEV;
 }
@@ -96,7 +96,7 @@ static int __init dummy_probe(struct pcie_device *dev)
                         dup_slot_id++;
         }
         list_add_tail(&slot->list, &dummy_slots);
-        handle = DEVICE_ACPI_HANDLE(&pdev->dev);
+        handle = ACPI_HANDLE(&pdev->dev);
         if (!acpi_slot_detected && acpi_pci_detect_ejectable(handle))
                 acpi_slot_detected = 1;
         return -ENODEV;         /* dummy driver always returns error */
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c
index 1b90579b233a..50ce68098298 100644
--- a/drivers/pci/ioapic.c
+++ b/drivers/pci/ioapic.c
@@ -37,7 +37,7 @@ static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)
         char *type;
         struct resource *res;
 
-        handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        handle = ACPI_HANDLE(&dev->dev);
         if (!handle)
                 return -EINVAL;
 
diff --git a/drivers/pci/pci-acpi.c b/drivers/pci/pci-acpi.c
index dfd1f59de729..f166126e28d1 100644
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@ -173,14 +173,14 @@ static pci_power_t acpi_pci_choose_state(struct pci_dev *pdev)
 
 static bool acpi_pci_power_manageable(struct pci_dev *dev)
 {
-        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        acpi_handle handle = ACPI_HANDLE(&dev->dev);
 
         return handle ? acpi_bus_power_manageable(handle) : false;
 }
 
 static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 {
-        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        acpi_handle handle = ACPI_HANDLE(&dev->dev);
         static const u8 state_conv[] = {
                 [PCI_D0] = ACPI_STATE_D0,
                 [PCI_D1] = ACPI_STATE_D1,
@@ -217,7 +217,7 @@ static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
 
 static bool acpi_pci_can_wakeup(struct pci_dev *dev)
 {
-        acpi_handle handle = DEVICE_ACPI_HANDLE(&dev->dev);
+        acpi_handle handle = ACPI_HANDLE(&dev->dev);
 
         return handle ? acpi_bus_can_wakeup(handle) : false;
 }
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;