aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/acpi.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-14 17:17:21 -0500
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-11-14 17:17:21 -0500
commit3a83f992490f8235661b768e53bd5f14915420ac (patch)
tree6394984f7c2cb0346966681b963bbaab5de14c9d /include/linux/acpi.h
parent7b1998116bbb2f3e5dd6cb9a8ee6db479b0b50a9 (diff)
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>
Diffstat (limited to 'include/linux/acpi.h')
-rw-r--r--include/linux/acpi.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 47369aadb1d1..86a3ba99a38d 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -482,8 +482,6 @@ static inline bool acpi_driver_match_device(struct device *dev,
482 482
483#endif /* !CONFIG_ACPI */ 483#endif /* !CONFIG_ACPI */
484 484
485#define DEVICE_ACPI_HANDLE(dev) ACPI_HANDLE(dev)
486
487#ifdef CONFIG_ACPI 485#ifdef CONFIG_ACPI
488void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state, 486void acpi_os_set_prepare_sleep(int (*func)(u8 sleep_state,
489 u32 pm1a_ctrl, u32 pm1b_ctrl)); 487 u32 pm1a_ctrl, u32 pm1b_ctrl));