[PATCH 0/3] acer-wmi patches for 2.6.25-rc5

[PATCH 0/3] acer-wmi patches for 2.6.25-rc5

[Carlos Corbacho]

Len,

The following patchset is some minor cleanups and an extra DMI quirk for
2.6.25-rc5.

If you're not happy with applying patch #3 now, it can always wait until 2.6.26

-Carlos
---

Carlos Corbacho (3):
      acer-wmi: Add mail LED support for Acer Aspire 3610/ 5610
      acer-wmi: Fix DSDT path in documentation
      acer-wmi: Make device detection error messages more descriptive


 Documentation/laptops/acer-wmi.txt |    2 +-
 drivers/misc/acer-wmi.c            |   30 +++++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 6 deletions(-)

[PATCH 1/3] acer-wmi: Make device detection error messages more descriptive

[Carlos Corbacho]

The current device detection error messages are all copy & pasted - make
them more descriptive so it's easier to see where in the code a problem
occurs.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 drivers/misc/acer-wmi.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)


diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 89439ac..89d346b 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -1052,11 +1052,12 @@ static int __init acer_wmi_init(void)
 
 	if (wmi_has_guid(WMID_GUID2) && interface) {
 		if (ACPI_FAILURE(WMID_set_capabilities())) {
-			printk(ACER_ERR "Unable to detect available devices\n");
+			printk(ACER_ERR "Unable to detect available WMID "
+					"devices\n");
 			return -ENODEV;
 		}
 	} else if (!wmi_has_guid(WMID_GUID2) && interface) {
-		printk(ACER_ERR "Unable to detect available devices\n");
+		printk(ACER_ERR "No WMID device detection method found\n");
 		return -ENODEV;
 	}
 
@@ -1064,7 +1065,8 @@ static int __init acer_wmi_init(void)
 		interface = &AMW0_interface;
 
 		if (ACPI_FAILURE(AMW0_set_capabilities())) {
-			printk(ACER_ERR "Unable to detect available devices\n");
+			printk(ACER_ERR "Unable to detect available AMW0 "
+					"devices\n");
 			return -ENODEV;
 		}
 	}
@@ -1075,8 +1077,8 @@ static int __init acer_wmi_init(void)
 	find_quirks();
 
 	if (!interface) {
-		printk(ACER_ERR "No or unsupported WMI interface, unable to ");
-		printk(KERN_CONT "load.\n");
+		printk(ACER_ERR "No or unsupported WMI interface, unable to "
+				"load\n");
 		return -ENODEV;
 	}
 

[PATCH 2/3] acer-wmi: Fix DSDT path in documentation

[Carlos Corbacho]

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 Documentation/laptops/acer-wmi.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Documentation/laptops/acer-wmi.txt b/Documentation/laptops/acer-wmi.txt
index a346c86..23df051 100644
--- a/Documentation/laptops/acer-wmi.txt
+++ b/Documentation/laptops/acer-wmi.txt
@@ -48,7 +48,7 @@ DSDT.
 
 To send me the DSDT, as root/sudo:
 
-cat /sys/firmware/acpi/DSDT > dsdt
+cat /sys/firmware/acpi/tables/DSDT > dsdt
 
 And send me the resulting 'dsdt' file.
 

[PATCH 3/3] acer-wmi: Add mail LED support for Acer Aspire 3610/ 5610

[Carlos Corbacho]

Add a DMI quirk entry to add mail LED support for this laptop series.

Signed-off-by: Carlos Corbacho <carlos@strangeworlds.co.uk>
---

 drivers/misc/acer-wmi.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)


diff --git a/drivers/misc/acer-wmi.c b/drivers/misc/acer-wmi.c
index 89d346b..dd13a37 100644
--- a/drivers/misc/acer-wmi.c
+++ b/drivers/misc/acer-wmi.c
@@ -219,6 +219,15 @@ static struct dmi_system_id acer_quirks[] = {
 	},
 	{
 		.callback = dmi_matched,
+		.ident = "Acer Aspire 3610",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3610"),
+		},
+		.driver_data = &quirk_acer_travelmate_2490,
+	},
+	{
+		.callback = dmi_matched,
 		.ident = "Acer Aspire 5100",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -228,6 +237,15 @@ static struct dmi_system_id acer_quirks[] = {
 	},
 	{
 		.callback = dmi_matched,
+		.ident = "Acer Aspire 5610",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"),
+		},
+		.driver_data = &quirk_acer_travelmate_2490,
+	},
+	{
+		.callback = dmi_matched,
 		.ident = "Acer Aspire 5630",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

Re: [PATCH 0/3] acer-wmi patches for 2.6.25-rc5

[Len Brown]

On Wednesday 12 March 2008, Carlos Corbacho wrote:
> Len,
> 
> The following patchset is some minor cleanups and an extra DMI quirk for
> 2.6.25-rc5.
> 
> If you're not happy with applying patch #3 now, it can always wait until 2.6.26

i think a DMI entry for a hook in a brand-new driver is fine.

1,2,3 applied.

thanks,
-Lenn

> -Carlos
> ---
> 
> Carlos Corbacho (3):
>       acer-wmi: Add mail LED support for Acer Aspire 3610/ 5610
>       acer-wmi: Fix DSDT path in documentation
>       acer-wmi: Make device detection error messages more descriptive
> 
> 
>  Documentation/laptops/acer-wmi.txt |    2 +-
>  drivers/misc/acer-wmi.c            |   30 +++++++++++++++++++++++++-----
>  2 files changed, 26 insertions(+), 6 deletions(-)
> 
>