From patchwork Sat Mar 14 15:35:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Chouquet-Stringer X-Patchwork-Id: 12133 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2EFZV9e019842 for ; Sat, 14 Mar 2009 15:35:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751393AbZCNPfb (ORCPT ); Sat, 14 Mar 2009 11:35:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751405AbZCNPfb (ORCPT ); Sat, 14 Mar 2009 11:35:31 -0400 Received: from relay2-v.mail.gandi.net ([217.70.178.76]:41295 "EHLO relay2-v.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751393AbZCNPfa (ORCPT ); Sat, 14 Mar 2009 11:35:30 -0400 X-Greylist: delayed 17602 seconds by postgrey-1.27 at vger.kernel.org; Sat, 14 Mar 2009 11:35:30 EDT Received: from mobydick.mine.nu (mobydick.vms.lost-oasis.net [212.85.155.23]) by relay2-v.mail.gandi.net (Postfix) with ESMTP id C08DD135AB; Sat, 14 Mar 2009 16:35:27 +0100 (CET) Received: from mobydick.mine.nu (mobydick.mine.nu [127.0.0.1]) by mobydick.mine.nu (8.13.8/8.13.8) with ESMTP id n2EFZRLn013257; Sat, 14 Mar 2009 16:35:27 +0100 Received: (from mchouque@localhost) by mobydick.mine.nu (8.13.8/8.13.8/Submit) id n2EFZQAI013256; Sat, 14 Mar 2009 16:35:26 +0100 Date: Sat, 14 Mar 2009 16:35:26 +0100 From: Mathieu Chouquet-Stringer To: Kay Sievers Cc: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, Len Brown , ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, stable@kernel.org, Henrique de Moraes Holschuh Subject: Re: [PATCH] thinkpad-acpi: fix module autoloading for older models Message-ID: <20090314153526.GA13084@mobydick> Mail-Followup-To: Mathieu Chouquet-Stringer , Kay Sievers , linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, Len Brown , ibm-acpi-devel@lists.sourceforge.net, linux-acpi@vger.kernel.org, stable@kernel.org, Henrique de Moraes Holschuh References: <20090314104204.GA11226@mobydick> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Face: %JOeya=Dg!}[/#Go&*&cQ+)){p1c8}u\Fg2Q3&)kothIq|JnWoVzJtCFo~4X X-Mailing-List: linux-acpi@vger.kernel.org On Sat, Mar 14, 2009 at 04:14:19PM +0100, Kay Sievers wrote: > On Sat, Mar 14, 2009 at 11:42, Mathieu Chouquet-Stringer > wrote: > > > While for older Thinkpads, you do this (for instance): > > IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); > > Aliases are shell-style globs. Any idea what the ',' are doing in a > character class? Confused ... Good point... I guess it's a typo: perhaps the original authors thought of it as a brace expansion? Something like 1{0,3,6,...}? A proper patch would then be: Signed-off-by: Mathieu Chouquet-Stringer drivers/platform/x86/thinkpad_acpi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) --- 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 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index bcbc051..d243320 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c @@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); * if it is not there yet. */ #define IBM_BIOS_MODULE_ALIAS(__type) \ - MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") + MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") /* Non-ancient thinkpads */ MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); @@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); /* Ancient thinkpad BIOSes have to be identified by * BIOS type or model number, and there are far less * BIOS types than model numbers... */ -IBM_BIOS_MODULE_ALIAS("I[B,D,H,I,M,N,O,T,W,V,Y,Z]"); -IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]"); -IBM_BIOS_MODULE_ALIAS("K[U,X-Z]"); +IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]"); +IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]"); +IBM_BIOS_MODULE_ALIAS("K[UX-Z]"); MODULE_AUTHOR("Borislav Deianov, Henrique de Moraes Holschuh"); MODULE_DESCRIPTION(TPACPI_DESC);