[PATCH 0/4] asus-laptop and eeepc-laptop regressions

[PATCH 0/4] asus-laptop and eeepc-laptop regressions

[Corentin Chary]

Hi Len,
Patch 1:    fixes http://bugzilla.kernel.org/show_bug.cgi?id=12501
Patch 2, 3: restore proc events for backward compatibility
Patch 4:    may be merged later, but no big changes here
Thanks

Corentin Chary (4):
  eeepc-laptop: Fix Kconfig
  asus-laptop: restore acpi_generate_proc_event()
  eeepc-laptop: restore acpi_generate_proc_event()
  asus-laptop: use select instead of depends on

 drivers/platform/x86/Kconfig        |    9 +++++----
 drivers/platform/x86/asus-laptop.c  |    5 ++++-
 drivers/platform/x86/eeepc-laptop.c |    6 +++++-
 3 files changed, 14 insertions(+), 6 deletions(-)

[PATCH 1/4] eeepc-laptop: Fix Kconfig

[Corentin Chary]

Add a "select INPUT" to Kconfig now that eeepc-laptop
is using the input layer.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 9436311..6f46bc6 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -305,6 +305,7 @@ config EEEPC_LAPTOP
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON
 	select RFKILL
+	select INPUT
 	---help---
 	  This driver supports the Fn-Fx keys on Eee PC laptops.
 	  It also adds the ability to switch camera/wlan on/off.
-- 
1.6.1.2

[PATCH 2/4] asus-laptop: restore acpi_generate_proc_event()

[Corentin Chary]

Restore acpi_generate_proc_event() for backward
compatibility with old acpi scripts.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/asus-laptop.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
index 56af6cf..eeafc6c 100644
--- a/drivers/platform/x86/asus-laptop.c
+++ b/drivers/platform/x86/asus-laptop.c
@@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
 static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
 	static struct key_entry *key;
+	u16 count;
 
 	/* TODO Find a better way to handle events count. */
 	if (!hotk)
@@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
 		lcd_blank(FB_BLANK_POWERDOWN);
 	}
 
+	count = hotk->event_count[event % 128]++;
+	acpi_bus_generate_proc_event(hotk->device, event, count);
 	acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
 					dev_name(&hotk->device->dev), event,
-					hotk->event_count[event % 128]++);
+					count);
 
 	if (hotk->inputdev) {
 		key = asus_get_entry_by_scancode(event);
-- 
1.6.1.2

[PATCH 3/4] eeepc-laptop: restore acpi_generate_proc_event()

[Corentin Chary]

Restore acpi_generate_proc_event() for backward
compatibility with old acpi scripts.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/eeepc-laptop.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
index 786ed86..6f54fd1 100644
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
 static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
 {
 	static struct key_entry *key;
+	u16 count;
+
 	if (!ehotk)
 		return;
 	if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
 		notify_brn();
+	count = ehotk->event_count[event % 128]++;
+	acpi_bus_generate_proc_event(ehotk->device, event, count);
 	acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
 					dev_name(&ehotk->device->dev), event,
-					ehotk->event_count[event % 128]++);
+					count);
 	if (ehotk->inputdev) {
 		key = eepc_get_entry_by_scancode(event);
 		if (key) {
-- 
1.6.1.2

[PATCH 4/4] asus-laptop: use select instead of depends on

[Corentin Chary]

Like thinkpad_acpi or eeepc-laptop, asus-laptop will
now use "select" instead of "depends on".

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/Kconfig |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 6f46bc6..000a4b7 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -39,10 +39,10 @@ config ASUS_LAPTOP
 	tristate "Asus Laptop Extras (EXPERIMENTAL)"
 	depends on ACPI
 	depends on EXPERIMENTAL && !ACPI_ASUS
-	depends on LEDS_CLASS
-	depends on NEW_LEDS
-	depends on BACKLIGHT_CLASS_DEVICE
-	depends on INPUT
+	select LEDS_CLASS
+	select NEW_LEDS
+	select BACKLIGHT_CLASS_DEVICE
+	select INPUT
 	---help---
 	  This is the new Linux driver for Asus laptops. It may also support some
 	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
-- 
1.6.1.2

Re: [PATCH 4/4] asus-laptop: use select instead of depends on

[Len Brown]

On Sun, 15 Feb 2009, Corentin Chary wrote:

> Like thinkpad_acpi or eeepc-laptop, asus-laptop will
> now use "select" instead of "depends on".
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/Kconfig |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 6f46bc6..000a4b7 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -39,10 +39,10 @@ config ASUS_LAPTOP
>  	tristate "Asus Laptop Extras (EXPERIMENTAL)"
>  	depends on ACPI
>  	depends on EXPERIMENTAL && !ACPI_ASUS
> -	depends on LEDS_CLASS
> -	depends on NEW_LEDS
> -	depends on BACKLIGHT_CLASS_DEVICE
> -	depends on INPUT
> +	select LEDS_CLASS
> +	select NEW_LEDS

okay, i guess that is more consistent (except for ACER)

> +	select BACKLIGHT_CLASS_DEVICE

this one is a little less consistent

I should probably just whack the file to make all the drivers
do exactly the same thing with these...

> +	select INPUT

switched thta one back to "depends on INPUT"

applied.
thanks,
-Len Brown, Intel Opoen Source Technology Center

>  	---help---
>  	  This is the new Linux driver for Asus laptops. It may also support some
>  	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
> -- 
> 1.6.1.2
> 
> 

Re: [PATCH 3/4] eeepc-laptop: restore acpi_generate_proc_event()

[Len Brown]

applied

--
Len Brown, Intel Open Source Technology Center

On Sun, 15 Feb 2009, Corentin Chary wrote:

> Restore acpi_generate_proc_event() for backward
> compatibility with old acpi scripts.
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/eeepc-laptop.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c
> index 786ed86..6f54fd1 100644
> --- a/drivers/platform/x86/eeepc-laptop.c
> +++ b/drivers/platform/x86/eeepc-laptop.c
> @@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
>  static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
>  {
>  	static struct key_entry *key;
> +	u16 count;
> +
>  	if (!ehotk)
>  		return;
>  	if (event >= NOTIFY_BRN_MIN && event <= NOTIFY_BRN_MAX)
>  		notify_brn();
> +	count = ehotk->event_count[event % 128]++;
> +	acpi_bus_generate_proc_event(ehotk->device, event, count);
>  	acpi_bus_generate_netlink_event(ehotk->device->pnp.device_class,
>  					dev_name(&ehotk->device->dev), event,
> -					ehotk->event_count[event % 128]++);
> +					count);
>  	if (ehotk->inputdev) {
>  		key = eepc_get_entry_by_scancode(event);
>  		if (key) {
> -- 
> 1.6.1.2
> 
> 

Re: [PATCH 2/4] asus-laptop: restore acpi_generate_proc_event()

[Len Brown]

applied

--
Len Brown, Intel Open Source Technology Center

On Sun, 15 Feb 2009, Corentin Chary wrote:

> Restore acpi_generate_proc_event() for backward
> compatibility with old acpi scripts.
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/asus-laptop.c |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c
> index 56af6cf..eeafc6c 100644
> --- a/drivers/platform/x86/asus-laptop.c
> +++ b/drivers/platform/x86/asus-laptop.c
> @@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)
>  static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
>  {
>  	static struct key_entry *key;
> +	u16 count;
>  
>  	/* TODO Find a better way to handle events count. */
>  	if (!hotk)
> @@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)
>  		lcd_blank(FB_BLANK_POWERDOWN);
>  	}
>  
> +	count = hotk->event_count[event % 128]++;
> +	acpi_bus_generate_proc_event(hotk->device, event, count);
>  	acpi_bus_generate_netlink_event(hotk->device->pnp.device_class,
>  					dev_name(&hotk->device->dev), event,
> -					hotk->event_count[event % 128]++);
> +					count);
>  
>  	if (hotk->inputdev) {
>  		key = asus_get_entry_by_scancode(event);
> -- 
> 1.6.1.2
> 
> 

Re: [PATCH 1/4] eeepc-laptop: Fix Kconfig

[Andrew Morton]

On Sun, 15 Feb 2009 19:30:18 +0100
Corentin Chary <corentincj@iksaif.net> wrote:

> Add a "select INPUT" to Kconfig now that eeepc-laptop
> is using the input layer.
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 9436311..6f46bc6 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -305,6 +305,7 @@ config EEEPC_LAPTOP
>  	select BACKLIGHT_CLASS_DEVICE
>  	select HWMON
>  	select RFKILL
> +	select INPUT
>  	---help---
>  	  This driver supports the Fn-Fx keys on Eee PC laptops.
>  	  It also adds the ability to switch camera/wlan on/off.

I'm getting

drivers/input/Kconfig:9:error: found recursive dependency: INPUT -> EEEPC_LAPTOP -> INPUT
make[1]: *** [oldconfig] Error 1

Re: [PATCH 1/4] eeepc-laptop: Fix Kconfig

[Corentin Chary]

There was a patch collision in -mm
It seems a patch with "depends INPUT" was already merged
I used select because ASUS_LAPTOP and THINKPAD_ACPI are using select
two, but for INPUT it's not realy needed.
Maybe we should do a sed '/select INPUT/depends on INPUT/
drivers/platform/x86/Kconfig

On Tue, Feb 24, 2009 at 11:44 PM, Andrew Morton
<akpm@linux-foundation.org> wrote:
> On Sun, 15 Feb 2009 19:30:18 +0100
> Corentin Chary <corentincj@iksaif.net> wrote:
>
>> Add a "select INPUT" to Kconfig now that eeepc-laptop
>> is using the input layer.
>>
>> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
>> ---
>>  drivers/platform/x86/Kconfig |    1 +
>>  1 files changed, 1 insertions(+), 0 deletions(-)
>>
>> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
>> index 9436311..6f46bc6 100644
>> --- a/drivers/platform/x86/Kconfig
>> +++ b/drivers/platform/x86/Kconfig
>> @@ -305,6 +305,7 @@ config EEEPC_LAPTOP
>>       select BACKLIGHT_CLASS_DEVICE
>>       select HWMON
>>       select RFKILL
>> +     select INPUT
>>       ---help---
>>         This driver supports the Fn-Fx keys on Eee PC laptops.
>>         It also adds the ability to switch camera/wlan on/off.
>
> I'm getting
>
> drivers/input/Kconfig:9:error: found recursive dependency: INPUT -> EEEPC_LAPTOP -> INPUT
> make[1]: *** [oldconfig] Error 1
>



-- 
Corentin Chary
http://xf.iksaif.net
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/4] eeepc-laptop: Fix Kconfig

[Andrew Morton]

On Wed, 25 Feb 2009 08:57:36 +0100 Corentin Chary <corentin.chary@gmail.com> wrote:

> On Tue, Feb 24, 2009 at 11:44 PM, Andrew Morton
> <akpm@linux-foundation.org> wrote:
> > On Sun, 15 Feb 2009 19:30:18 +0100
> > Corentin Chary <corentincj@iksaif.net> wrote:
> >
> >> Add a "select INPUT" to Kconfig now that eeepc-laptop
> >> is using the input layer.
> >>
> >> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> >> ---
> >> __drivers/platform/x86/Kconfig | __ __1 +
> >> __1 files changed, 1 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> >> index 9436311..6f46bc6 100644
> >> --- a/drivers/platform/x86/Kconfig
> >> +++ b/drivers/platform/x86/Kconfig
> >> @@ -305,6 +305,7 @@ config EEEPC_LAPTOP
> >> __ __ __ select BACKLIGHT_CLASS_DEVICE
> >> __ __ __ select HWMON
> >> __ __ __ select RFKILL
> >> + __ __ select INPUT
> >> __ __ __ ---help---
> >> __ __ __ __ This driver supports the Fn-Fx keys on Eee PC laptops.
> >> __ __ __ __ It also adds the ability to switch camera/wlan on/off.
> >
> > I'm getting
> >
> > drivers/input/Kconfig:9:error: found recursive dependency: INPUT -> EEEPC_LAPTOP -> INPUT
> > make[1]: *** [oldconfig] Error 1
> >

(top-posting repaired.  Please don't - it makes it really hard to reply
to you)

> There was a patch collision in -mm
> It seems a patch with "depends INPUT" was already merged
> I used select because ASUS_LAPTOP and THINKPAD_ACPI are using select
> two, but for INPUT it's not realy needed.
> Maybe we should do a sed '/select INPUT/depends on INPUT/
> drivers/platform/x86/Kconfig
> 

I hate `select' and will gleefully leap on any s/select/depends/ patch,
whether it works or not :)

[PATCH] platform/x86: depends instead of select for laptop platform drivers

[Corentin Chary]

"I hate `select' and will gleefully leap on any s/select/depends/ patch,
whether it works or not :)"
  Andrew Morton

select INPUT is not needed here, because if someone doesn't want INPUT,
he won't want these drivers either.

Signed-off-by: Corentin Chary <corentincj@iksaif.net>
---
 drivers/platform/x86/Kconfig |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 7a46ed8..8cd903c 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -39,10 +39,10 @@ config ASUS_LAPTOP
 	tristate "Asus Laptop Extras (EXPERIMENTAL)"
 	depends on ACPI
 	depends on EXPERIMENTAL && !ACPI_ASUS
+	depends on INPUT
 	select LEDS_CLASS
 	select NEW_LEDS
 	select BACKLIGHT_CLASS_DEVICE
-	select INPUT
 	---help---
 	  This is the new Linux driver for Asus laptops. It may also support some
 	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
@@ -185,11 +185,11 @@ config SONYPI_COMPAT
 config THINKPAD_ACPI
 	tristate "ThinkPad ACPI Laptop Extras"
 	depends on ACPI
+	depends on INPUT
 	select BACKLIGHT_LCD_SUPPORT
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON
 	select NVRAM
-	select INPUT
 	select NEW_LEDS
 	select LEDS_CLASS
 	select NET
@@ -307,7 +307,6 @@ config EEEPC_LAPTOP
 	select BACKLIGHT_CLASS_DEVICE
 	select HWMON
 	select RFKILL
-	select INPUT
 	---help---
 	  This driver supports the Fn-Fx keys on Eee PC laptops.
 	  It also adds the ability to switch camera/wlan on/off.
-- 
1.6.1.3

Re: [PATCH] platform/x86: depends instead of select for laptop platform drivers

[Len Brown]

--
Len Brown, Intel Open Source Technology Center

On Wed, 25 Feb 2009, Corentin Chary wrote:

> "I hate `select' and will gleefully leap on any s/select/depends/ patch,
> whether it works or not :)"
>   Andrew Morton
> 
> select INPUT is not needed here, because if someone doesn't want INPUT,
> he won't want these drivers either.
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/Kconfig |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 7a46ed8..8cd903c 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -39,10 +39,10 @@ config ASUS_LAPTOP
>  	tristate "Asus Laptop Extras (EXPERIMENTAL)"
>  	depends on ACPI
>  	depends on EXPERIMENTAL && !ACPI_ASUS
> +	depends on INPUT
>  	select LEDS_CLASS
>  	select NEW_LEDS
>  	select BACKLIGHT_CLASS_DEVICE
> -	select INPUT
>  	---help---
>  	  This is the new Linux driver for Asus laptops. It may also support some
>  	  MEDION, JVC or VICTOR laptops. It makes all the extra buttons generate
> @@ -185,11 +185,11 @@ config SONYPI_COMPAT
>  config THINKPAD_ACPI
>  	tristate "ThinkPad ACPI Laptop Extras"
>  	depends on ACPI
> +	depends on INPUT
>  	select BACKLIGHT_LCD_SUPPORT
>  	select BACKLIGHT_CLASS_DEVICE
>  	select HWMON
>  	select NVRAM
> -	select INPUT
>  	select NEW_LEDS
>  	select LEDS_CLASS
>  	select NET

applied the thinkpad hunk above.
the other two were already handled previously.

all the drivers in that Kconfig now depend on INPUT, rather than selecting 
it

thanks,
Len Brown, Intel Open Source Technology Center

> @@ -307,7 +307,6 @@ config EEEPC_LAPTOP
>  	select BACKLIGHT_CLASS_DEVICE
>  	select HWMON
>  	select RFKILL
> -	select INPUT
>  	---help---
>  	  This driver supports the Fn-Fx keys on Eee PC laptops.
>  	  It also adds the ability to switch camera/wlan on/off.
> -- 
> 1.6.1.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH 1/4] eeepc-laptop: Fix Kconfig

[Len Brown]

dropped, b/c the "depends on" version is already merged

--
Len Brown, Intel Open Source Technology Center

On Sun, 15 Feb 2009, Corentin Chary wrote:

> Add a "select INPUT" to Kconfig now that eeepc-laptop
> is using the input layer.
> 
> Signed-off-by: Corentin Chary <corentincj@iksaif.net>
> ---
>  drivers/platform/x86/Kconfig |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
> index 9436311..6f46bc6 100644
> --- a/drivers/platform/x86/Kconfig
> +++ b/drivers/platform/x86/Kconfig
> @@ -305,6 +305,7 @@ config EEEPC_LAPTOP
>  	select BACKLIGHT_CLASS_DEVICE
>  	select HWMON
>  	select RFKILL
> +	select INPUT
>  	---help---
>  	  This driver supports the Fn-Fx keys on Eee PC laptops.
>  	  It also adds the ability to switch camera/wlan on/off.
> -- 
> 1.6.1.2
> 
>