[PATCH 0/3] sony-laptop and sonypi for 2.6.23-rc2

[PATCH 0/3] sony-laptop and sonypi for 2.6.23-rc2

[Mattia Dongili]

Hi Len,

these 3 patches are aimed at 2.6.23-rc2 if there is time enough.
There's only http://bugzilla.kernel.org/show_bug.cgi?id=8803 left,
I hope to be able to have it sorted out soon.

Please apply
---
 drivers/char/sonypi.c      |    8 ++++++--
 drivers/misc/sony-laptop.c |    9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)
-- 
mattia

[PATCH 1/3] sony-laptop: restore the last user requested brightness level on resume.

[Mattia Dongili]

Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/misc/sony-laptop.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 303e48c..a1be82e 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -942,6 +942,11 @@ static int sony_nc_resume(struct acpi_device *device)
 		}
 	}
 
+	/* set the last requested brightness level */
+	if (sony_backlight_device &&
+			!sony_backlight_update_status(sony_backlight_device))
+		printk(KERN_WARNING DRV_PFX "unable to restore brightness level");
+
 	/* re-initialize models with specific requirements */
 	dmi_check_system(sony_nc_ids);
 
-- 
1.5.2.4

[PATCH 2/3] sony-laptop: sony_nc_ids[] can become static.

[Mattia Dongili]

From: Adrian Bunk <bunk@stusta.de>

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/misc/sony-laptop.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index a1be82e..99f48c7 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -845,7 +845,7 @@ static struct sony_nc_event sony_C_events[] = {
 };
 
 /* SNC-only model map */
-struct dmi_system_id sony_nc_ids[] = {
+static struct dmi_system_id sony_nc_ids[] = {
 		{
 			.ident = "Sony Vaio FE Series",
 			.callback = sony_nc_C_enable,
-- 
1.5.2.4

[PATCH 3/3] sonypi: fix ids member of struct acpi_driver

[Mattia Dongili]

From: Eugene Teo <eugeneteo@kernel.sg>

ids member of struct acpi_driver is of type struct acpi_device_id, not a
character array.

Signed-off-by: Eugene Teo <eugeneteo@kernel.sg>
Signed-off-by: Mattia Dongili <malattia@linux.it>
---
 drivers/char/sonypi.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 73037a4..aeec67e 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1147,10 +1147,15 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
+const static struct acpi_device_id sonypi_device_ids[] = {
+	{"SNY6001", 0},
+	{"", 0},
+};
+
 static struct acpi_driver sonypi_acpi_driver = {
 	.name           = "sonypi",
 	.class          = "hkey",
-	.ids            = "SNY6001",
+	.ids            = sonypi_device_ids,
 	.ops            = {
 		           .add = sonypi_acpi_add,
 			   .remove = sonypi_acpi_remove,
-- 
1.5.2.4

Re: [PATCH 0/3] sony-laptop and sonypi for 2.6.23-rc2

[Len Brown]

Applied.

thanks,
-Len

On Friday 03 August 2007 11:22, Mattia Dongili wrote:
> Hi Len,
> 
> these 3 patches are aimed at 2.6.23-rc2 if there is time enough.
> There's only http://bugzilla.kernel.org/show_bug.cgi?id=8803 left,
> I hope to be able to have it sorted out soon.
> 
> Please apply
> ---
>  drivers/char/sonypi.c      |    8 ++++++--
>  drivers/misc/sony-laptop.c |    9 ++++++---
>  2 files changed, 12 insertions(+), 5 deletions(-)