From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Len Brown <lenb@kernel.org>
Cc: ACPI Devel Maling List <linux-acpi@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>,
Linux-pm mailing list <linux-pm@lists.linux-foundation.org>,
Matthew Garrett <mjg59@srcf.ucam.org>,
Maciej Rutecki <maciej.rutecki@gmail.com>
Subject: [PATCH] Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
Date: Fri, 26 Nov 2010 22:55:20 +0100 [thread overview]
Message-ID: <201011262255.20848.rjw@sisk.pl> (raw)
In-Reply-To: <201011250001.11297.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
Use the new function acpi_bus_update_power(), which is safer than
acpi_bus_get_power(), for getting device power state in
acpi_fujitsu_add().
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Reported-and-Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
---
Hi Len,
This patch should go after [11/13] in the "ACPI / PM: Rework power resources
management" series. I hope Matthew won't mind if it goes in through your tree.
Thanks,
Rafael
---
drivers/platform/x86/fujitsu-laptop.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Index: linux-2.6/drivers/platform/x86/fujitsu-laptop.c
===================================================================
--- linux-2.6.orig/drivers/platform/x86/fujitsu-laptop.c
+++ linux-2.6/drivers/platform/x86/fujitsu-laptop.c
@@ -689,7 +689,7 @@ static int acpi_fujitsu_add(struct acpi_
if (error)
goto err_free_input_dev;
- result = acpi_bus_get_power(fujitsu->acpi_handle, &state);
+ result = acpi_bus_update_power(fujitsu->acpi_handle, &state);
if (result) {
printk(KERN_ERR "Error reading power state\n");
goto err_unregister_input_dev;
@@ -857,7 +857,7 @@ static int acpi_fujitsu_hotkey_add(struc
if (error)
goto err_free_input_dev;
- result = acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
+ result = acpi_bus_update_power(fujitsu_hotkey->acpi_handle, &state);
if (result) {
printk(KERN_ERR "Error reading power state\n");
goto err_unregister_input_dev;
next prev parent reply other threads:[~2010-11-26 21:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-24 23:01 [PATCH 0/13] ACPI / PM: Rework power resources management Rafael J. Wysocki
2010-11-24 23:02 ` [PATCH 1/13] ACPI / PM: Check device state before refcounting power resources Rafael J. Wysocki
2010-11-24 23:03 ` [PATCH 2/13] ACPI / PM: Do not refcount power resources that can't be turned on Rafael J. Wysocki
2010-11-24 23:05 ` [PATCH 3/13] ACPI / PM: Prevent acpi_power_get_inferred_state() from making changes Rafael J. Wysocki
2010-11-24 23:06 ` [PATCH 4/13] ACPI / PM: Add functions for manipulating lists of power resources Rafael J. Wysocki
2010-11-24 23:06 ` [PATCH 5/13] ACPI / PM: Introduce function for refcounting device " Rafael J. Wysocki
2010-11-24 23:07 ` [PATCH 6/13] ACPI / PM: Introduce __acpi_bus_get_power() Rafael J. Wysocki
2010-11-24 23:08 ` [PATCH 7/13] ACPI / PM: Add function for device power state initialization Rafael J. Wysocki
2010-11-24 23:09 ` [PATCH 8/13] ACPI / PM: Add function for updating device power state consistently Rafael J. Wysocki
2010-11-24 23:10 ` [PATCH 9/13] ACPI / PM: Register acpi_power_driver early Rafael J. Wysocki
2010-11-24 23:10 ` [PATCH 10/13] ACPI / PM: Register power resource devices as soon as they are needed Rafael J. Wysocki
2010-11-24 23:11 ` [PATCH 11/13] ACPI / Fan: Rework the handling of power resources Rafael J. Wysocki
2010-11-24 23:12 ` [PATCH 12/13] ACPI / PM: Drop acpi_bus_get_power() Rafael J. Wysocki
2010-12-01 22:02 ` Len Brown
2010-12-01 22:07 ` Rafael J. Wysocki
2010-11-24 23:12 ` [PATCH 13/13] ACPI / PM: Drop acpi_power_nocheck Rafael J. Wysocki
2010-11-26 21:55 ` Rafael J. Wysocki [this message]
2010-12-01 22:07 ` [PATCH] Platform / x86: Make fujitsu_laptop use acpi_bus_update_power() Len Brown
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=201011262255.20848.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=maciej.rutecki@gmail.com \
--cc=mjg59@srcf.ucam.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