Re: [PATCH 0/13] ACPI / PM: Rework power resources management

["Rafael J. Wysocki" <rjw@sisk.pl>]

On Thursday, November 25, 2010, Sedat Dilek wrote:
> On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Thursday, November 25, 2010, Rafael J. Wysocki wrote:
> >> On Thursday, November 25, 2010, Sedat Dilek wrote:
> >> > On Thu, Nov 25, 2010 at 10:41 AM, Sedat Dilek
> >> > <sedat.dilek@googlemail.com> wrote:
> >> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
> >> > > <sedat.dilek@googlemail.com> wrote:
> >> > >> Hi Rafael,
> >> > >>
> >> > [ ... ]
> >> > >> # grep "error:" build_linux-next_next20101124.dileks.2.log
> >> > >> /home/sd/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none/drivers/platform/x86/fujitsu-laptop.c:692:
> >> > >> error: implicit declaration of function ‘acpi_bus_get_power’
> >> > [ ... ]
> >> > >
> >> > > Guess this is conflicting with your patch
> >> > > "12-13-ACPI-PM-Drop-acpi_bus_get_power.patch".
> >> > >
> >> > > - Sedat -
> >> > >
> >> > > P.S.: Note to myself, add the following snippet for testing purposes:
> >> > >
> >> > > [ debian/config/i386/none/config.686 ]
> >> > > ...
> >> > > ##
> >> > > ## file: drivers/platform/x86/Kconfig
> >> > > ##
> >> > > # CONFIG_FUJITSU_LAPTOP is not set
> >> > > - EOT -
> >> > >
> >> >
> >> > Applied on top of linux-next (next-20101125) and running.
> >> >
> >> >      Tested-by: Sedat Dilek <sedat.dilek@gmail.com>
> >>
> >> Great, thanks a lot!
> >>
> >> I should have said the patchset is on top of the current Linus' tree.
> >
> > Actually it also breaks with the current Linus' tree, but the appended patch
> > should fix it.
> >
> > Thanks,
> > Rafael
> >
> > ---
> > From: Rafael J. Wysocki <rjw@sisk.pl>
> > Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()
> >
> > 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>
> > ---
> >  drivers/platform/x86/fujitsu-laptop.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > 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;
> >
> 
> Sorry, I crapped my own quotes.
> Missed to catch line #860?

Indeed, sorry.  Updated patch is appended.

Rafael


---
From: Rafael J. Wysocki <rjw@sisk.pl>
Subject: Platform / x86: Make fujitsu_laptop use acpi_bus_update_power()

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>
---
 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;