Skip to contentSkip to conversation

asus-acpi: remove duplicate comparison of asus_model strings

PATCH Applied [email protected] 4 participants 4 messages Feb 2, 2010 – Feb 16, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 5/7 asus-acpi: remove duplicate comparison of asus_model strings

From: Roel Kluin <[email protected]>

These tests already occur elsewhere

Cc Corentin Chary <[email protected]>
Cc Karol Kozimor <[email protected]>
Cc Len Brown <[email protected]>

---

 drivers/platform/x86/asus_acpi.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/platform/x86/asus_acpi.c renamed from drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings +1 -2
diff -puN drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings drivers/platform/x86/asus_acpi.c
@@ -1225,9 +1225,8 @@ static int asus_model_match(char *model)
 	else if (strncmp(model, "M2N", 3) == 0 ||
 		 strncmp(model, "M3N", 3) == 0 ||
 		 strncmp(model, "M5N", 3) == 0 ||
-		 strncmp(model, "M6N", 3) == 0 ||
 		 strncmp(model, "S1N", 3) == 0 ||
-		 strncmp(model, "S5N", 3) == 0 || strncmp(model, "W1N", 3) == 0)
+		 strncmp(model, "S5N", 3) == 0)
 		return xxN;
 	else if (strncmp(model, "M1", 2) == 0)
 		return M1A;

_

maintainer
#1 lore raw
Quoted 24 lines · On Tue, Feb 2, 2010 at 11:37 PM, <[email protected]> wrote:

From: Roel Kluin <[email protected]>

These tests already occur elsewhere

Cc Corentin Chary <[email protected]>
Cc Karol Kozimor <[email protected]>
Cc Len Brown <[email protected]>

---

 drivers/platform/x86/asus_acpi.c |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

diff -puN drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings drivers/platform/x86/asus_acpi.c

drivers/platform/x86/asus_acpi.c renamed from drivers/platform/x86/asus_acpi.c~asus-acpi-remove-duplicate-comparison-of-asus_model-strings +0 -0
@@ -1225,9 +1225,8 @@ static int asus_model_match(char *model)

       else if (strncmp(model, "M2N", 3) == 0 ||

                strncmp(model, "M3N", 3) == 0 ||
                strncmp(model, "M5N", 3) == 0 ||
-                strncmp(model, "M6N", 3) == 0 ||
                strncmp(model, "S1N", 3) == 0 ||
-                strncmp(model, "S5N", 3) == 0 || strncmp(model, "W1N", 3) == 0)
Quoted 6 lines

+                strncmp(model, "S5N", 3) == 0) return xxN;
       else if (strncmp(model, "M1", 2) == 0) return M1A;
_

Ack,

Roel, are you still using this driver ? Have you a good reason to use it instead of asus-laptop ?

Signature · 6 lines
Corentin Chary
http://xf.iksaif.net
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#2 lore raw
Quoted 4 lines
Quoted 1 line

+++ a/drivers/platform/x86/asus_acpi.c

Roel, are you still using this driver ? Have you a good reason to use it instead of asus-laptop ?

No, I just found the duplicate tests using grep and sed.

Thanks,

Roel