The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Lin Ming <ming.m.lin@intel.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>, Len Brown <lenb@kernel.og>
Cc: linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
	Zhang Rui <rui.zhang@intel.com>,
	Huang Ying <huang.ying.caritas@gmail.com>,
	Aaron Lu <aaron.lu@amd.com>
Subject: [PATCH 2/6] ACPI: Set D3cold state as default device sleep state
Date: Tue, 17 Apr 2012 13:47:52 +0800	[thread overview]
Message-ID: <1334641676-14566-3-git-send-email-ming.m.lin@intel.com> (raw)
In-Reply-To: <1334641676-14566-1-git-send-email-ming.m.lin@intel.com>

D3cold state is returned if no other preferred power state is found.

Signed-off-by: Lin Ming <ming.m.lin@intel.com>
---
 drivers/acpi/sleep.c    |    2 +-
 include/acpi/acpi_bus.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 1d661b5..1fcfb78 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -705,7 +705,7 @@ int acpi_pm_device_sleep_state(struct device *dev, int *d_min_p)
 	 * _S0W, we will use the value from _S0W
 	 */
 	d_min = ACPI_STATE_D0;
-	d_max = ACPI_STATE_D3;
+	d_max = ACPI_STATE_D3_COLD;
 
 	/*
 	 * If present, _SxD methods return the minimum D-state (highest power
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index f1c8ca6..2db51aa 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -389,7 +389,7 @@ static inline int acpi_pm_device_sleep_state(struct device *d, int *p)
 {
 	if (p)
 		*p = ACPI_STATE_D0;
-	return ACPI_STATE_D3;
+	return ACPI_STATE_D3_COLD;
 }
 #endif
 
-- 
1.7.2.5


  parent reply	other threads:[~2012-04-17  5:49 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-17  5:47 [PATCH 0/6]: ACPI D3 state cleanup Lin Ming
2012-04-17  5:47 ` [PATCH 1/6] ACPI: D3cold state is always valid Lin Ming
2012-04-17  6:03   ` huang ying
2012-04-18 21:13     ` Rafael J. Wysocki
2012-04-19  1:35       ` huang ying
2012-04-19 11:51         ` Rafael J. Wysocki
2012-04-19 15:23           ` Lin Ming
2012-04-19 20:39             ` Rafael J. Wysocki
2012-04-17 20:29   ` Rafael J. Wysocki
2012-04-18  2:15     ` Lin Ming
2012-04-18  2:32       ` Lin Ming
2012-04-18  9:09         ` Rafael J. Wysocki
2012-04-17  5:47 ` Lin Ming [this message]
2012-04-17  5:47 ` [PATCH 3/6] ACPI: Set D3cold state as default inferred state Lin Ming
2012-04-17  5:47 ` [PATCH 4/6] ACPI: Fix power resource's device power state when it's off Lin Ming
2012-04-17  5:47 ` [PATCH 5/6] PCI/ACPI: Map PCI D3cold state to ACPI D3cold state Lin Ming
2012-04-17  5:47 ` [PATCH 6/6] ACPI: Rename ACPI_STATE_D3 to ACPI_STATE_D3_HOT Lin Ming

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=1334641676-14566-3-git-send-email-ming.m.lin@intel.com \
    --to=ming.m.lin@intel.com \
    --cc=aaron.lu@amd.com \
    --cc=huang.ying.caritas@gmail.com \
    --cc=lenb@kernel.og \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@sisk.pl \
    --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