From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
Linux PCI <linux-pci@vger.kernel.org>,
Zhang Rui <rui.zhang@intel.com>,
Peter Zijlstra <peterz@infradead.org>
Subject: [PATCH 2/2] ACPI / PM: Rename acpi_wakeup_device() to acpi_device_pm_event()
Date: Sat, 19 Jul 2014 22:38:12 +0200 [thread overview]
Message-ID: <11454851.tGNHnoC7c5@vostro.rjw.lan> (raw)
In-Reply-To: <1907495.agrCMfRsQN@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
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 <rafael.j.wysocki@intel.com>
---
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
next prev parent reply other threads:[~2014-07-19 20:20 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-19 20:36 [PATCH 0/2] ACPI / PM: Make ACPI-based PCI wakeup work for the "freeze" sleep state Rafael J. Wysocki
2014-07-19 20:37 ` [PATCH 1/2] ACPI / PM: Always enable wakeup GPEs when enabling device wakeup Rafael J. Wysocki
2014-07-20 7:17 ` [Update][PATCH " Rafael J. Wysocki
2014-07-20 23:51 ` [Update 2x][PATCH " Rafael J. Wysocki
2014-07-21 8:17 ` Peter Zijlstra
2014-07-22 1:02 ` Rafael J. Wysocki
2014-07-19 20:38 ` Rafael J. Wysocki [this message]
2014-07-22 1:23 ` [PATCH 0/3] ACPI / PM: Make ACPI-based PCI wakeup work for the "freeze" sleep state Rafael J. Wysocki
2014-07-22 1:24 ` [PATCH 1/3] PM: Create PM workqueue if runtime PM is not configured too Rafael J. Wysocki
2014-07-22 1:25 ` [PATCH 2/3] ACPI / PM: Revork the handling of ACPI device wakeup notifications Rafael J. Wysocki
2014-07-22 12:29 ` [Update][PATCH " Rafael J. Wysocki
2014-07-22 1:26 ` [PATCH 3/3] ACPI / PM: Always enable wakeup GPEs when enabling device wakeup Rafael J. Wysocki
2014-07-22 8:55 ` [PATCH 0/3] ACPI / PM: Make ACPI-based PCI wakeup work for the "freeze" sleep state Peter Zijlstra
2014-07-22 9:42 ` Peter Zijlstra
2014-07-22 12:23 ` Rafael J. Wysocki
2014-07-22 12:13 ` Peter Zijlstra
2014-07-22 22:26 ` Rafael J. Wysocki
2014-07-23 7:28 ` Peter Zijlstra
2014-07-23 11:43 ` Rafael J. Wysocki
2014-07-23 11:38 ` Peter Zijlstra
2014-07-23 12:17 ` Rafael J. Wysocki
2014-07-23 12:04 ` Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=11454851.tGNHnoC7c5@vostro.rjw.lan \
--to=rjw@rjwysocki.net \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®