diff options
author | Henrique de Moraes Holschuh <hmh@hmh.eng.br> | 2009-04-13 22:44:13 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-18 01:19:54 -0400 |
commit | 922fe097b1e8f2f2f23dbed61cfe6e0316fecff1 (patch) | |
tree | c976b28ed526f222f20cd4f20ff8d3a3f2fc6741 | |
parent | f68f53a217b827580647d23fdc34eecdcb3739c6 (diff) |
thinkpad-acpi: simplify module autoloading
Simplify the module autoloading a great deal, by keying to the HID for
the HKEY interface.
Only _really_ ancient IBM ThinkPad models like the 240, 240x and 570
lack the HKEY interface, and they're getting their own trimmed-down
driver one of these days.
Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | drivers/platform/x86/thinkpad_acpi.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 7a7cac264b80..caa774ae2392 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
@@ -7861,6 +7861,15 @@ static int __init thinkpad_acpi_module_init(void) | |||
7861 | MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); | 7861 | MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); |
7862 | 7862 | ||
7863 | /* | 7863 | /* |
7864 | * This will autoload the driver in almost every ThinkPad | ||
7865 | * in widespread use. | ||
7866 | * | ||
7867 | * Only _VERY_ old models, like the 240, 240x and 570 lack | ||
7868 | * the HKEY event interface. | ||
7869 | */ | ||
7870 | MODULE_DEVICE_TABLE(acpi, ibm_htk_device_ids); | ||
7871 | |||
7872 | /* | ||
7864 | * DMI matching for module autoloading | 7873 | * DMI matching for module autoloading |
7865 | * | 7874 | * |
7866 | * See http://thinkwiki.org/wiki/List_of_DMI_IDs | 7875 | * See http://thinkwiki.org/wiki/List_of_DMI_IDs |
@@ -7872,16 +7881,10 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME); | |||
7872 | #define IBM_BIOS_MODULE_ALIAS(__type) \ | 7881 | #define IBM_BIOS_MODULE_ALIAS(__type) \ |
7873 | MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") | 7882 | MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*") |
7874 | 7883 | ||
7875 | /* Non-ancient thinkpads */ | ||
7876 | MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); | ||
7877 | MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*"); | ||
7878 | |||
7879 | /* Ancient thinkpad BIOSes have to be identified by | 7884 | /* Ancient thinkpad BIOSes have to be identified by |
7880 | * BIOS type or model number, and there are far less | 7885 | * BIOS type or model number, and there are far less |
7881 | * BIOS types than model numbers... */ | 7886 | * BIOS types than model numbers... */ |
7882 | IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]"); | 7887 | IBM_BIOS_MODULE_ALIAS("I[MU]"); /* 570, 570e */ |
7883 | IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]"); | ||
7884 | IBM_BIOS_MODULE_ALIAS("K[UX-Z]"); | ||
7885 | 7888 | ||
7886 | MODULE_AUTHOR("Borislav Deianov <borislav@users.sf.net>"); | 7889 | MODULE_AUTHOR("Borislav Deianov <borislav@users.sf.net>"); |
7887 | MODULE_AUTHOR("Henrique de Moraes Holschuh <hmh@hmh.eng.br>"); | 7890 | MODULE_AUTHOR("Henrique de Moraes Holschuh <hmh@hmh.eng.br>"); |