releases/upstream/2.6.26-rc1/0004-ACPI-thinkpad-acpi-enhance-box-identification-outp.patch

   1 From 8c74adbc692a3cb040cc69d7ca3dfd86d75860a8 Mon Sep 17 00:00:00 2001
   2 From: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
   3 Date: Sat, 26 Apr 2008 01:02:19 -0300
   4 Subject: ACPI: thinkpad-acpi: enhance box identification output (v2)
   5
   6 During initialization, thinkpad-acpi outputs some messages to make sure
   7 releavant box identification information is easily available in-line with
   8 the rest of the driver messages.
   9
  10 Enhance those messages to output the alfanumeric model number as well.
  11
  12 Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br>
  13 Signed-off-by: Len Brown <len.brown@intel.com>
  14 ---
  15  drivers/misc/thinkpad_acpi.c |   12 +++++++++---
  16  1 files changed, 9 insertions(+), 3 deletions(-)
  17
  18 diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
  19 index cd263c5..601dbe8 100644
  20 --- a/drivers/misc/thinkpad_acpi.c
  21 +++ b/drivers/misc/thinkpad_acpi.c
  22 @@ -251,7 +251,8 @@ struct thinkpad_id_data {
  23         u16 bios_model;         /* Big Endian, TP-1Y = 0x5931, 0 = unknown */
  24         u16 ec_model;
  25
  26 -       char *model_str;
  27 +       char *model_str;        /* ThinkPad T43 */
  28 +       char *nummodel_str;     /* 9384A9C for a 9384-A9C model */
  29  };
  30  static struct thinkpad_id_data thinkpad_id;
  31
  32 @@ -988,12 +989,14 @@ static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
  33                         thinkpad_id.ec_version_str : "unknown");
  34
  35         if (thinkpad_id.vendor && thinkpad_id.model_str)
  36 -               printk(TPACPI_INFO "%s %s\n",
  37 +               printk(TPACPI_INFO "%s %s, model %s\n",
  38                         (thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
  39                                 "IBM" : ((thinkpad_id.vendor ==
  40                                                 PCI_VENDOR_ID_LENOVO) ?
  41                                         "Lenovo" : "Unknown vendor"),
  42 -                       thinkpad_id.model_str);
  43 +                       thinkpad_id.model_str,
  44 +                       (thinkpad_id.nummodel_str) ?
  45 +                               thinkpad_id.nummodel_str : "unknown");
  46
  47         return 0;
  48  }
  49 @@ -5875,6 +5878,9 @@ static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
  50                 kfree(tp->model_str);
  51                 tp->model_str = NULL;
  52         }
  53 +
  54 +       tp->nummodel_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_NAME),
  55 +                                       GFP_KERNEL);
  56  }
  57
  58  static int __init probe_for_thinkpad(void)
  59 --
  60 1.5.4.4
  61