From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Carlos Corbacho <carlos@strangeworlds.co.uk>,
LKML <linux-kernel@vger.kernel.org>,
"Moore, Robert" <robert.moore@intel.com>,
Pavel Machek <pavel@suse.cz>,
pm list <linux-pm@lists.linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Arjan van de Ven <arjan@infradead.org>
Subject: [RFC][PATCH 7/7] ACPI: Print message before calling _PTS
Date: Thu, 27 Dec 2007 19:20:01 +0100 [thread overview]
Message-ID: <200712271920.02207.rjw@sisk.pl> (raw)
In-Reply-To: <200712271903.53961.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Make acpi_sleep_prepare() static and cause it to print a message
specifying the ACPI system sleep state to be entered (helpful for
debugging the suspend/hibernation code).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/sleep/main.c | 4 +++-
drivers/acpi/sleep/sleep.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/main.c
+++ linux-2.6/drivers/acpi/sleep/main.c
@@ -29,7 +29,7 @@ static u32 acpi_target_sleep_state = ACP
static bool acpi_sleep_finish_wake_up;
#endif
-int acpi_sleep_prepare(u32 acpi_state)
+static int acpi_sleep_prepare(u32 acpi_state)
{
#ifdef CONFIG_ACPI_SLEEP
/* do we have a wakeup address for S2 and S3? */
@@ -45,6 +45,8 @@ int acpi_sleep_prepare(u32 acpi_state)
ACPI_FLUSH_CPU_CACHE();
acpi_enable_wakeup_device_prep(acpi_state);
#endif
+ printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
+ acpi_state);
acpi_enter_sleep_state_prep(acpi_state);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep/sleep.h
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/sleep.h
+++ linux-2.6/drivers/acpi/sleep/sleep.h
@@ -5,5 +5,3 @@ extern int acpi_suspend (u32 state);
extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
extern void acpi_enable_wakeup_device(u8 sleep_state);
extern void acpi_disable_wakeup_device(u8 sleep_state);
-
-extern int acpi_sleep_prepare(u32 acpi_state);
WARNING: multiple messages have this Message-ID (diff)
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Arjan van de Ven <arjan@infradead.org>,
Carlos Corbacho <carlos@strangeworlds.co.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>, Pavel Machek <pavel@suse.cz>,
pm list <linux-pm@lists.linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Len Brown <lenb@kernel.org>,
Alexey Starikovskiy <aystarik@gmail.com>,
"Moore, Robert" <robert.moore@intel.com>
Subject: [RFC][PATCH 7/7] ACPI: Print message before calling _PTS
Date: Thu, 27 Dec 2007 19:20:01 +0100 [thread overview]
Message-ID: <200712271920.02207.rjw@sisk.pl> (raw)
In-Reply-To: <200712271903.53961.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Make acpi_sleep_prepare() static and cause it to print a message
specifying the ACPI system sleep state to be entered (helpful for
debugging the suspend/hibernation code).
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/sleep/main.c | 4 +++-
drivers/acpi/sleep/sleep.h | 2 --
2 files changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6/drivers/acpi/sleep/main.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/main.c
+++ linux-2.6/drivers/acpi/sleep/main.c
@@ -29,7 +29,7 @@ static u32 acpi_target_sleep_state = ACP
static bool acpi_sleep_finish_wake_up;
#endif
-int acpi_sleep_prepare(u32 acpi_state)
+static int acpi_sleep_prepare(u32 acpi_state)
{
#ifdef CONFIG_ACPI_SLEEP
/* do we have a wakeup address for S2 and S3? */
@@ -45,6 +45,8 @@ int acpi_sleep_prepare(u32 acpi_state)
ACPI_FLUSH_CPU_CACHE();
acpi_enable_wakeup_device_prep(acpi_state);
#endif
+ printk(KERN_INFO PREFIX "Preparing to enter system sleep state S%d\n",
+ acpi_state);
acpi_enter_sleep_state_prep(acpi_state);
return 0;
}
Index: linux-2.6/drivers/acpi/sleep/sleep.h
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep/sleep.h
+++ linux-2.6/drivers/acpi/sleep/sleep.h
@@ -5,5 +5,3 @@ extern int acpi_suspend (u32 state);
extern void acpi_enable_wakeup_device_prep(u8 sleep_state);
extern void acpi_enable_wakeup_device(u8 sleep_state);
extern void acpi_disable_wakeup_device(u8 sleep_state);
-
-extern int acpi_sleep_prepare(u32 acpi_state);
next prev parent reply other threads:[~2007-12-27 18:20 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-27 18:03 [RFC][PATCH 0/7] Fix the ACPI 1.0 vs ACPI 2.0 suspend ordering issue Rafael J. Wysocki
2007-12-27 18:08 ` Carlos Corbacho
2007-12-27 22:40 ` Rafael J. Wysocki
2007-12-27 22:40 ` Rafael J. Wysocki
2007-12-27 18:08 ` Carlos Corbacho
2007-12-27 18:13 ` [RFC][PATCH 1/7] Suspend: Introduce open() and close() callbacks Rafael J. Wysocki
2007-12-27 18:13 ` Rafael J. Wysocki
2007-12-27 18:15 ` [RFC][PATCH 2/7] ACPI: Separate invocations of _GTS and _BFS from _PTS and _WAK Rafael J. Wysocki
2007-12-27 18:15 ` Rafael J. Wysocki
2008-01-03 10:42 ` Pavel Machek
2008-01-03 10:42 ` Pavel Machek
2008-01-03 17:06 ` Rafael J. Wysocki
2008-01-03 17:06 ` Rafael J. Wysocki
2007-12-27 18:16 ` [RFC][PATCH 3/7] ACPI: Separate disabling of GPEs from _PTS Rafael J. Wysocki
2007-12-27 18:16 ` Rafael J. Wysocki
2008-01-03 10:43 ` Pavel Machek
2008-01-03 10:43 ` Pavel Machek
2008-01-03 17:07 ` Rafael J. Wysocki
2008-01-03 17:07 ` Rafael J. Wysocki
2007-12-27 18:17 ` [RFC][PATCH 4/7] Suspend: Call _PTS early on ACPI 1.0x systems Rafael J. Wysocki
2007-12-27 18:17 ` Rafael J. Wysocki
2007-12-27 18:18 ` [RFC][PATCH 5/7] Hibernation: Introduce open() and close() callbacks Rafael J. Wysocki
2007-12-27 18:18 ` Rafael J. Wysocki
2007-12-27 18:19 ` [RFC][PATCH 6/7] Hibernation: Call _PTS early on ACPI 1.0x systems Rafael J. Wysocki
2007-12-27 18:19 ` Rafael J. Wysocki
2007-12-27 18:20 ` Rafael J. Wysocki [this message]
2007-12-27 18:20 ` [RFC][PATCH 7/7] ACPI: Print message before calling _PTS Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2008-01-05 22:32 [RFC][PATCH 0/7] Fix the ACPI 1.0 vs ACPI 2.0 suspend ordering issue (rev. 2) Rafael J. Wysocki
2008-01-05 22:58 ` [RFC][PATCH 7/7] ACPI: Print message before calling _PTS Rafael J. Wysocki
2008-01-05 22:58 ` Rafael J. Wysocki
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=200712271920.02207.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=akpm@linux-foundation.org \
--cc=arjan@infradead.org \
--cc=carlos@strangeworlds.co.uk \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=pavel@suse.cz \
--cc=robert.moore@intel.com \
--cc=torvalds@linux-foundation.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.