On Thu, Nov 25, 2010 at 9:45 PM, Rafael J. Wysocki <rjw@xxxxxxx> wrote:
> On Thursday, November 25, 2010, Sedat Dilek wrote:
>> 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?
>
> Indeed, sorry. ÂUpdated patch is appended.
>
> 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 | Â Â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;
>
Feel free to add for
"Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch":
Reported-and-Tested-by: Sedat Dilek <sedat.dilek@xxxxxxxxx>
- Sedat -
# grep OK setup_linux-next_next20101126.dileks.1.log | grep ACPI-PM
(+) OK ACPI-PM/1-13-ACPI-PM-Check-device-state-before-refcounting-power-resources.patch
(+) OK ACPI-PM/2-13-ACPI-PM-Do-not-refcount-power-resources-that-can-t-be-turned-on.patch
(+) OK ACPI-PM/3-13-ACPI-PM-Prevent-acpi_power_get_inferred_state-from-making-changes.patch
(+) OK ACPI-PM/4-13-ACPI-PM-Add-functions-for-manipulating-lists-of-power-resources.patch
(+) OK ACPI-PM/5-13-ACPI-PM-Introduce-function-for-refcounting-device-power-resources.patch
(+) OK ACPI-PM/6-13-ACPI-PM-Introduce-__acpi_bus_get_power.patch
(+) OK ACPI-PM/7-13-ACPI-PM-Add-function-for-device-power-state-initialization.patch
(+) OK ACPI-PM/8-13-ACPI-PM-Add-function-for-updating-device-power-state-consistently.patch
(+) OK ACPI-PM/9-13-ACPI-PM-Register-acpi_power_driver-early.patch
(+) OK ACPI-PM/10-13-ACPI-PM-Register-power-resource-devices-as-soon-as-they-are-needed.patch
(+) OK ACPI-PM/11-13-ACPI-Fan-Rework-the-handling-of-power-resources.patch
(+) OK ACPI-PM/12-13-ACPI-PM-Drop-acpi_bus_get_power.patch
(+) OK ACPI-PM/13-13-ACPI-PM-Drop-acpi_power_nocheck.patch
(+) OK ACPI-PM-fix/Platform-x86-Make-fujitsu_laptop-use-acpi_bus_update_power.patch
# modinfo fujitsu-laptop
filename:
/lib/modules/2.6.37-rc3-686/kernel/drivers/platform/x86/fujitsu-laptop.ko
alias: dmi:*:svnFUJITSU:*:pvr:rvnFUJITSU:rnFJNB19C:*:cvrS7020:*
alias: dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1E6:*:cvrS6420:*
alias: dmi:*:svnFUJITSUSIEMENS:*:pvr:rvnFUJITSU:rnFJNB1D3:*:cvrS6410:*
license: GPL
version: 0.6.0
description: Fujitsu laptop extras support
author: Jonathan Woithe, Peter Gruber, Tony Vroon
srcversion: FFA7AB6B6C940453C0946B4
alias: acpi*:FUJ02E3:*
alias: pnp:dFUJ02E3*
alias: acpi*:FUJ02B1:*
alias: pnp:dFUJ02B1*
alias: acpi*:FUJ02BF:*
alias: pnp:dFUJ02bf*
depends:
vermagic: 2.6.37-rc3-686 SMP mod_unload modversions 686
parm: use_alt_lcd_levels:Use alternative interface for
lcd_levels (needed for Lifebook s6410). (uint)
parm: disable_brightness_adjust:Disable brightness adjustment . (uint)
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
