Skip to contentSkip to conversation

acer-wmi patches for 2.6.25-rc5

PATCH In review Carlos Corbacho 2 participants 5 messages Mar 12, 2008

Subsystems (3)
Documentation ACPI Char and misc drivers
lore
Share & tools
lore

Carlos Corbacho

author
#0 lore raw

cover acer-wmi patches for 2.6.25-rc5

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(-)
author
#1 lore raw

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

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 <[email protected]>

---

 drivers/misc/acer-wmi.c |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
drivers/misc/acer-wmi.c +7 -5
index 89439ac..89d346b 100644
@@ -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;
 	}
author
#2 lore raw

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

In reply to Carlos Corbacho
Signed-off-by Carlos Corbacho <[email protected]>

---

 Documentation/laptops/acer-wmi.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Documentation/laptops/acer-wmi.txt +1 -1
index a346c86..23df051 100644
@@ -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.
author
#3 lore raw

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

In reply to Carlos Corbacho

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

Signed-off-by Carlos Corbacho <[email protected]>

---

 drivers/misc/acer-wmi.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)
drivers/misc/acer-wmi.c +18 -0
index 89d346b..dd13a37 100644
@@ -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"),
reviewer
#4 lore raw
In reply to Carlos Corbacho
Quoted 6 lines · 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

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

1,2,3 applied.

thanks,
-Lenn

Quoted 14 lines

-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(-)