| Message ID | 20090314153526.GA13084@mobydick (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Sat, 14 Mar 2009, Mathieu Chouquet-Stringer wrote: > On Sat, Mar 14, 2009 at 04:14:19PM +0100, Kay Sievers wrote: > > On Sat, Mar 14, 2009 at 11:42, Mathieu Chouquet-Stringer > > <mchouque@free.fr> 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,...}? I bet that's exactly what happened... it was a long time ago, so I don't recall exactly what I was (not) thinking about when I did it. Thanks for noticing this, and the revised patch looks good. > A proper patch would then be: > > Signed-off-by: Mathieu Chouquet-Stringer <mchouque@free.fr> > drivers/platform/x86/thinkpad_acpi.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > > 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);
On Sat, 14 Mar 2009, Henrique de Moraes Holschuh wrote: > On Sat, 14 Mar 2009, Mathieu Chouquet-Stringer wrote: > > On Sat, Mar 14, 2009 at 04:14:19PM +0100, Kay Sievers wrote: > > > On Sat, Mar 14, 2009 at 11:42, Mathieu Chouquet-Stringer > > > <mchouque@free.fr> 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,...}? > > I bet that's exactly what happened... it was a long time ago, so I don't > recall exactly what I was (not) thinking about when I did it. > > Thanks for noticing this, and the revised patch looks good. revised patch (with commit log from 1st patch) applied. thanks, Len Brown, Intel Open Source Technology Center -- 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);