From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
Lv Zheng <lv.zheng@intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [PATCH 4/4] ACPI / PM: Sanitize checks in acpi_power_on_resources()
Date: Tue, 22 Jan 2013 03:11:32 +0100 [thread overview]
Message-ID: <2460397.W1PpBYs6jy@vostro.rjw.lan> (raw)
In-Reply-To: <1792467.qHBR6KraFh@vostro.rjw.lan>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
After the only user of acpi_power_on_resources(),
acpi_bus_init_power(), has been changed to avoid calling it
for state equal to ACPI_STATE_D3_COLD, it doesn't have to special
case that state any more.
For this reason, modify the checks in acpi_power_on_resources()
so that it returns -EINVAL for ACPI_STATE_D3_COLD as it should.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/power.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
Index: linux-pm/drivers/acpi/power.c
===================================================================
--- linux-pm.orig/drivers/acpi/power.c
+++ linux-pm/drivers/acpi/power.c
@@ -622,12 +622,9 @@ int acpi_power_get_inferred_state(struct
int acpi_power_on_resources(struct acpi_device *device, int state)
{
- if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_COLD)
+ if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_HOT)
return -EINVAL;
- if (state == ACPI_STATE_D3_COLD)
- return 0;
-
return acpi_power_on_list(&device->power.states[state].resources);
}
prev parent reply other threads:[~2013-01-22 2:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-22 2:05 [PATCH 0/4] ACPI / PM: Initial power state checking and power state setting changes Rafael J. Wysocki
2013-01-22 2:09 ` [PATCH 1/4] ACPI / PM: Make acpi_bus_init_power() more robust Rafael J. Wysocki
2013-01-22 7:10 ` Mika Westerberg
2013-01-22 2:09 ` [PATCH 2/4] ACPI / PM: Introduce helper for executing _PSn methods Rafael J. Wysocki
2013-01-22 2:10 ` [PATCH 3/4] ACPI / PM: Always evaluate _PSn after setting power resources Rafael J. Wysocki
2013-01-22 2:11 ` Rafael J. Wysocki [this message]
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=2460397.W1PpBYs6jy@vostro.rjw.lan \
--to=rjw@sisk.pl \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=lv.zheng@intel.com \
--cc=mika.westerberg@linux.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®