From: Rafael J. Wysocki <[email protected]> To avoid confusion with acpi_device_wakeup(), rename the default ACPI device PM notify handler from acpi_wakeup_device() to acpi_device_pm_event().
No functional changes. Signed-off-by: Rafael J. Wysocki <[email protected]> --- drivers/acpi/device_pm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: linux-pm/drivers/acpi/device_pm.c =================================================================== --- linux-pm.orig/drivers/acpi/device_pm.c +++ linux-pm/drivers/acpi/device_pm.c @@ -640,12 +640,12 @@ static int acpi_device_wakeup(struct acp #ifdef CONFIG_PM_RUNTIME /** - * acpi_wakeup_device - Wakeup notification handler for ACPI devices. + * acpi_device_pm_event - Wakeup notification handler for ACPI devices. * @handle: ACPI handle of the device the notification is for. * @event: Type of the signaled event. * @context: Device corresponding to @handle. */ -static void acpi_wakeup_device(acpi_handle handle, u32 event, void *context) +static void acpi_device_pm_event(acpi_handle handle, u32 event, void *context) { struct device *dev = context; @@ -680,7 +680,7 @@ int acpi_pm_device_run_wake(struct devic } EXPORT_SYMBOL(acpi_pm_device_run_wake); #else -static inline void acpi_wakeup_device(acpi_handle handle, u32 event, +static inline void acpi_device_pm_event(acpi_handle handle, u32 event, void *context) {} #endif /* CONFIG_PM_RUNTIME */ @@ -1036,7 +1036,7 @@ int acpi_dev_pm_attach(struct device *de if (dev->pm_domain) return -EEXIST; - acpi_add_pm_notifier(adev, acpi_wakeup_device, dev); + acpi_add_pm_notifier(adev, acpi_device_pm_event, dev); dev->pm_domain = &acpi_general_pm_domain; if (power_on) { acpi_dev_pm_full_power(adev); @@ -1064,7 +1064,7 @@ void acpi_dev_pm_detach(struct device *d if (adev && dev->pm_domain == &acpi_general_pm_domain) { dev->pm_domain = NULL; - acpi_remove_pm_notifier(adev, acpi_wakeup_device); + acpi_remove_pm_notifier(adev, acpi_device_pm_event); if (power_off) { /* * If the device's PM QoS resume latency limit or flags -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
