releases/upstream/2.6.30-rc4/0004-thinkpad-acpi-simplify-module-autoloading.patch

   1 From 922fe097b1e8f2f2f23dbed61cfe6e0316fecff1 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Tue, 14 Apr 2009 02:44:13 +0000
   4 Subject: thinkpad-acpi: simplify module autoloading
   5
   6 Simplify the module autoloading a great deal, by keying to the HID for
   7 the HKEY interface.
   8
   9 Only _really_ ancient IBM ThinkPad models like the 240, 240x and 570
  10 lack the HKEY interface, and they're getting their own trimmed-down
  11 driver one of these days.
  12
  13 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  14 Signed-off-by: Len Brown <len.brown@intel.com>
  15 ---
  16  drivers/platform/x86/thinkpad_acpi.c |   17 ++++++++++-------
  17  1 files changed, 10 insertions(+), 7 deletions(-)
  18
  19 diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
  20 index 7a7cac2..caa774a 100644
  21 --- a/drivers/platform/x86/thinkpad_acpi.c
  22 +++ b/drivers/platform/x86/thinkpad_acpi.c
  23 @@ -7861,6 +7861,15 @@ static int __init thinkpad_acpi_module_init(void)
  24  MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
  25
  26  /*
  27 + * This will autoload the driver in almost every ThinkPad
  28 + * in widespread use.
  29 + *
  30 + * Only _VERY_ old models, like the 240, 240x and 570 lack
  31 + * the HKEY event interface.
  32 + */
  33 +MODULE_DEVICE_TABLE(acpi, ibm_htk_device_ids);
  34 +
  35 +/*
  36   * DMI matching for module autoloading
  37   *
  38   * See http://thinkwiki.org/wiki/List_of_DMI_IDs
  39 @@ -7872,16 +7881,10 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);
  40  #define IBM_BIOS_MODULE_ALIAS(__type) \
  41         MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")
  42
  43 -/* Non-ancient thinkpads */
  44 -MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*");
  45 -MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
  46 -
  47  /* Ancient thinkpad BIOSes have to be identified by
  48   * BIOS type or model number, and there are far less
  49   * BIOS types than model numbers... */
  50 -IBM_BIOS_MODULE_ALIAS("I[BDHIMNOTWVYZ]");
  51 -IBM_BIOS_MODULE_ALIAS("1[0368A-GIKM-PST]");
  52 -IBM_BIOS_MODULE_ALIAS("K[UX-Z]");
  53 +IBM_BIOS_MODULE_ALIAS("I[MU]");                /* 570, 570e */
  54
  55  MODULE_AUTHOR("Borislav Deianov <borislav@users.sf.net>");
  56  MODULE_AUTHOR("Henrique de Moraes Holschuh <hmh@hmh.eng.br>");
  57 --
  58 1.6.2.3
  59