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

[Sedat Dilek]

On Thu, Nov 25, 2010 at 9:29 PM, Rafael J. Wysocki <rjw@xxxxxxx> 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@xxxxxxxxxxxxxx> wrote:
>> > > On Thu, Nov 25, 2010 at 10:11 AM, Sedat Dilek
>> > > <sedat.dilek@xxxxxxxxxxxxxx> 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@xxxxxxxxx>
>>
>> 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@xxxxxxx>
> 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@xxxxxxx>
> ---
> Â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?

- Sedat -

$ cd ~/src/linux-2.6/linux-2.6.37-rc3/debian/build/source_i386_none

$ grep --line-number -r acpi_bus_get_power -r drivers/platform/x86/
drivers/platform/x86/fujitsu-laptop.c:692:      result =
acpi_bus_get_power(fujitsu->acpi_handle, &state);
drivers/platform/x86/fujitsu-laptop.c:860:      result =
acpi_bus_get_power(fujitsu_hotkey->acpi_handle, &state);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/