2009-12-06 02:15:59

by Patrick Ringl

[permalink] [raw]
Subject: [PATCH]: drivers/platform/x86/Kconfig - fix inconsistency

Hi,

I just discovered an inconsistency in a Kconfig file. DELL_WMI as well
as HP_WMI should not depend on ACPI_WMI but select it, as all the other
WMI-related, platform-specific device drivers like TC1100_WMI or
ACER_WMI do.

This -as of right now- prevents the selection of the two initially
mentioned drivers unless one, by chance, enables ACPI_WMI and then goes
back.


Signed-off-by: Patrick Ringl <[email protected]>

--- linux-2.6.32-o/drivers/platform/x86/Kconfig 2009-12-03
04:51:21.000000000 +0100
+++ linux-2.6.32/drivers/platform/x86/Kconfig 2009-12-06
02:32:47.000000000 +0100
@@ -86,8 +86,8 @@

config DELL_WMI
tristate "Dell WMI extras"
- depends on ACPI_WMI
depends on INPUT
+ select ACPI_WMI
---help---
Say Y here if you want to support WMI-based hotkeys on Dell laptops.

@@ -133,9 +133,9 @@

config HP_WMI
tristate "HP WMI extras"
- depends on ACPI_WMI
depends on INPUT
depends on RFKILL || RFKILL = n
+ select ACPI_WMI
help
Say Y here if you want to support WMI-based hotkeys on HP laptops and
to read data from WMI such as docking or ambient light sensor state.
---



regards,
Patrick


2009-12-06 17:35:40

by Patrick Ringl

[permalink] [raw]
Subject: Re: [PATCH]: drivers/platform/x86/Kconfig - fix inconsistency

Hi,

Randy Dunlap wrote:
> Patrick Ringl wrote:
>
>> Hi,
>>
>> I just discovered an inconsistency in a Kconfig file. DELL_WMI as well
>> as HP_WMI should not depend on ACPI_WMI but select it, as all the other
>> WMI-related, platform-specific device drivers like TC1100_WMI or
>> ACER_WMI do.
>>
>> This -as of right now- prevents the selection of the two initially
>> mentioned drivers unless one, by chance, enables ACPI_WMI and then goes
>> back.
>>
>
> Then you'll also need to add
> depends on ACPI
> to both of those drivers. Without this addition,
> these drivers could enable ACPI_WMI even when ACPI
> is not enabled.
>
>
Oh yea, I've missed that.

Signed-off-by: Patrick Ringl <[email protected]>

--- linux-2.6.32-o/drivers/platform/x86/Kconfig 2009-12-03 04:51:21.000000000 +0100
+++ linux-2.6.32/drivers/platform/x86/Kconfig 2009-12-06 18:08:09.000000000 +0100
@@ -86,8 +86,9 @@

config DELL_WMI
tristate "Dell WMI extras"
- depends on ACPI_WMI
depends on INPUT
+ depends on ACPI
+ select ACPI_WMI
---help---
Say Y here if you want to support WMI-based hotkeys on Dell laptops.

@@ -133,9 +134,10 @@

config HP_WMI
tristate "HP WMI extras"
- depends on ACPI_WMI
+ depends on ACPI
depends on INPUT
depends on RFKILL || RFKILL = n
+ select ACPI_WMI
help
Say Y here if you want to support WMI-based hotkeys on HP laptops and
to read data from WMI such as docking or ambient light sensor state.

---
>
>> Signed-off-by: Patrick Ringl <[email protected]>
>>
>> --- linux-2.6.32-o/drivers/platform/x86/Kconfig 2009-12-03
>> 04:51:21.000000000 +0100
>> +++ linux-2.6.32/drivers/platform/x86/Kconfig 2009-12-06
>> 02:32:47.000000000 +0100
>> @@ -86,8 +86,8 @@
>>
>> config DELL_WMI
>> tristate "Dell WMI extras"
>> - depends on ACPI_WMI
>> depends on INPUT
>> + select ACPI_WMI
>> ---help---
>> Say Y here if you want to support WMI-based hotkeys on Dell laptops.
>>
>> @@ -133,9 +133,9 @@
>>
>> config HP_WMI
>> tristate "HP WMI extras"
>> - depends on ACPI_WMI
>> depends on INPUT
>> depends on RFKILL || RFKILL = n
>> + select ACPI_WMI
>> help
>> Say Y here if you want to support WMI-based hotkeys on HP laptops and
>> to read data from WMI such as docking or ambient light sensor state.
>> ---
>>
>
>
>
>
regards,
Patrick

2009-12-06 17:01:44

by Randy Dunlap

[permalink] [raw]
Subject: Re: [PATCH]: drivers/platform/x86/Kconfig - fix inconsistency

Patrick Ringl wrote:
> Hi,
>
> I just discovered an inconsistency in a Kconfig file. DELL_WMI as well
> as HP_WMI should not depend on ACPI_WMI but select it, as all the other
> WMI-related, platform-specific device drivers like TC1100_WMI or
> ACER_WMI do.
>
> This -as of right now- prevents the selection of the two initially
> mentioned drivers unless one, by chance, enables ACPI_WMI and then goes
> back.

Then you'll also need to add
depends on ACPI
to both of those drivers. Without this addition,
these drivers could enable ACPI_WMI even when ACPI
is not enabled.


> Signed-off-by: Patrick Ringl <[email protected]>
>
> --- linux-2.6.32-o/drivers/platform/x86/Kconfig 2009-12-03
> 04:51:21.000000000 +0100
> +++ linux-2.6.32/drivers/platform/x86/Kconfig 2009-12-06
> 02:32:47.000000000 +0100
> @@ -86,8 +86,8 @@
>
> config DELL_WMI
> tristate "Dell WMI extras"
> - depends on ACPI_WMI
> depends on INPUT
> + select ACPI_WMI
> ---help---
> Say Y here if you want to support WMI-based hotkeys on Dell laptops.
>
> @@ -133,9 +133,9 @@
>
> config HP_WMI
> tristate "HP WMI extras"
> - depends on ACPI_WMI
> depends on INPUT
> depends on RFKILL || RFKILL = n
> + select ACPI_WMI
> help
> Say Y here if you want to support WMI-based hotkeys on HP laptops and
> to read data from WMI such as docking or ambient light sensor state.
> ---



--
~Randy