From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Ingo Molnar <mingo@elte.hu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Len Brown <len.brown@intel.com>,
Alan Stern <stern@rowland.harvard.edu>,
linux-pm@lists.linux-foundation.org,
linux-kernel@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
linux-embedded@vger.kernel.org,
Thomas Gleixner <tglx@linutronix.de>
Subject: [PATCH 1/5] ACPI / PM: Move references to pm_flags into sleep.c
Date: Tue, 8 Feb 2011 22:20:24 +0100 [thread overview]
Message-ID: <201102082220.25240.rjw@sisk.pl> (raw)
In-Reply-To: <201102082218.28015.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
If direct references to pm_flags are moved from bus.c to sleep.c,
CONFIG_ACPI will not need to depend on CONFIG_PM any more.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/acpi/Kconfig | 1 -
drivers/acpi/bus.c | 4 +---
drivers/acpi/internal.h | 6 ++++++
drivers/acpi/sleep.c | 12 ++++++++++++
4 files changed, 19 insertions(+), 4 deletions(-)
Index: linux-2.6/drivers/acpi/bus.c
===================================================================
--- linux-2.6.orig/drivers/acpi/bus.c
+++ linux-2.6/drivers/acpi/bus.c
@@ -1025,9 +1025,7 @@ static int __init acpi_init(void)
if (!result) {
pci_mmcfg_late_init();
- if (!(pm_flags & PM_APM))
- pm_flags |= PM_ACPI;
- else {
+ if (!acpi_pm_enabled()) {
printk(KERN_INFO PREFIX
"APM is already active, exiting\n");
disable_acpi();
Index: linux-2.6/drivers/acpi/internal.h
===================================================================
--- linux-2.6.orig/drivers/acpi/internal.h
+++ linux-2.6/drivers/acpi/internal.h
@@ -82,12 +82,18 @@ void acpi_ec_unblock_transactions_early(
extern int acpi_sleep_init(void);
#ifdef CONFIG_ACPI_SLEEP
+/* drivers/acpi/sleep.c */
+bool acpi_pm_enabled(void);
+
+/* drivers/acpi/nvs.c */
int acpi_sleep_proc_init(void);
int suspend_nvs_alloc(void);
void suspend_nvs_free(void);
int suspend_nvs_save(void);
void suspend_nvs_restore(void);
#else
+static inline bool acpi_pm_enabled(void) { return true; }
+
static inline int acpi_sleep_proc_init(void) { return 0; }
static inline int suspend_nvs_alloc(void) { return 0; }
static inline void suspend_nvs_free(void) {}
Index: linux-2.6/drivers/acpi/sleep.c
===================================================================
--- linux-2.6.orig/drivers/acpi/sleep.c
+++ linux-2.6/drivers/acpi/sleep.c
@@ -657,6 +657,18 @@ int acpi_pm_device_sleep_state(struct de
#ifdef CONFIG_PM_SLEEP
/**
+ *
+ */
+bool acpi_pm_enabled(void)
+{
+ if (!(pm_flags & PM_APM)) {
+ pm_flags |= PM_ACPI;
+ return true;
+ }
+ return false;
+}
+
+/**
* acpi_pm_device_sleep_wake - enable or disable the system wake-up
* capability of given device
* @dev: device to handle
Index: linux-2.6/drivers/acpi/Kconfig
===================================================================
--- linux-2.6.orig/drivers/acpi/Kconfig
+++ linux-2.6/drivers/acpi/Kconfig
@@ -7,7 +7,6 @@ menuconfig ACPI
depends on !IA64_HP_SIM
depends on IA64 || X86
depends on PCI
- depends on PM
select PNP
default y
help
next prev parent reply other threads:[~2011-02-08 21:24 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-07 12:22 [PATCH] PM: Hide CONFIG_PM from users Mark Brown
2011-02-07 12:40 ` Geert Uytterhoeven
2011-02-07 13:26 ` Mark Brown
2011-02-07 12:48 ` Ingo Molnar
2011-02-07 13:09 ` Mark Brown
2011-02-07 14:13 ` Stephen Rothwell
2011-02-07 14:18 ` Mark Brown
2011-02-07 14:44 ` Stephen Rothwell
2011-02-07 14:50 ` Mark Brown
2011-02-07 15:00 ` Geert Uytterhoeven
2011-02-07 15:10 ` Stephen Rothwell
2011-02-07 15:19 ` Stephen Rothwell
2011-02-07 15:21 ` Mark Brown
2011-02-07 15:36 ` Alan Stern
2011-02-07 15:49 ` Mark Brown
2011-02-07 19:16 ` Rafael J. Wysocki
2011-02-08 1:17 ` Ray Lee
2011-02-08 11:18 ` Mark Brown
2011-02-07 19:14 ` Rafael J. Wysocki
2011-02-07 19:30 ` Mark Brown
2011-02-07 19:46 ` Rafael J. Wysocki
2011-02-07 20:18 ` Mark Brown
2011-02-07 21:15 ` Rafael J. Wysocki
2011-02-07 21:47 ` Dmitry Torokhov
2011-02-07 22:00 ` Rafael J. Wysocki
2011-02-07 22:23 ` Dmitry Torokhov
2011-02-07 23:05 ` Rafael J. Wysocki
2011-02-08 0:50 ` Dmitry Torokhov
2011-02-08 9:23 ` Rafael J. Wysocki
2011-02-08 16:48 ` Paul Mundt
2011-02-08 12:12 ` Mark Brown
2011-02-08 12:21 ` [PATCH] Remove CONFIG_PM altogether, enable power management all the time Ingo Molnar
2011-02-08 21:18 ` [PATCH 0/5] " Rafael J. Wysocki
2011-02-08 21:20 ` Rafael J. Wysocki [this message]
2011-02-08 23:40 ` [PATCH 1/5] ACPI / PM: Move references to pm_flags into sleep.c Linus Torvalds
2011-02-09 0:37 ` Rafael J. Wysocki
2011-02-09 1:04 ` Linus Torvalds
2011-02-08 21:21 ` [PATCH 2/5] PM: Make CONFIG_PM depend on (CONFIG_PM_SLEEP || CONFIG_PM_RUNTIME) Rafael J. Wysocki
2011-02-08 21:21 ` [PATCH 3/5] PM: Reorder power management Kconfig options Rafael J. Wysocki
2011-02-08 21:22 ` [PATCH 4/5] PM: Replace CONFIG_PM_OPS with CONFIG_PM Rafael J. Wysocki
2011-02-08 21:23 ` [PATCH 5/5] PM: Clean up Kconfig dependencies Rafael J. Wysocki
2011-02-08 23:43 ` Linus Torvalds
2011-02-10 23:32 ` [Updated][PATCH 5/5] PM: Clean up PM_TRACE dependencies and drop unnecessary Kconfig option Rafael J. Wysocki
2011-02-08 23:35 ` [PATCH] Remove CONFIG_PM altogether, enable power management all the time Frank Rowand
2011-02-09 11:41 ` Mark Brown
2011-02-09 11:58 ` Mark Brown
2011-02-09 17:07 ` Rafael J. Wysocki
2011-02-09 18:31 ` Frank Rowand
2011-02-09 18:40 ` Mark Brown
2011-02-09 19:00 ` Frank Rowand
2011-02-09 19:25 ` Mark Brown
2011-02-09 19:53 ` Tim Bird
2011-02-09 19:59 ` Mark Brown
2011-02-09 20:09 ` Alan Stern
2011-02-09 20:10 ` Mark Brown
2011-02-08 23:35 ` Tim Bird
2011-02-09 2:41 ` Ingo Molnar
2011-02-08 2:52 ` [PATCH] PM: Hide CONFIG_PM from users Frank Rowand
2011-02-08 14:15 ` Mark Brown
2011-02-08 14:29 ` Pavel Machek
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=201102082220.25240.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=akpm@linux-foundation.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dmitry.torokhov@gmail.com \
--cc=len.brown@intel.com \
--cc=linux-embedded@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=mingo@elte.hu \
--cc=stern@rowland.harvard.edu \
--cc=tglx@linutronix.de \
--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 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®