aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/thinkpad_acpi.c
diff options
context:
space:
mode:
authorHenrique de Moraes Holschuh <hmh@hmh.eng.br>2008-04-26 00:02:19 -0400
committerLen Brown <len.brown@intel.com>2008-04-29 09:47:00 -0400
commit8c74adbc692a3cb040cc69d7ca3dfd86d75860a8 (patch)
tree33d8cb7274bd5d226a21fd16255e1b2ca34ab8dc /drivers/misc/thinkpad_acpi.c
parent92889022250d736e135ca92fbffd1ab0ea4780d1 (diff)
ACPI: thinkpad-acpi: enhance box identification output (v2)
During initialization, thinkpad-acpi outputs some messages to make sure releavant box identification information is easily available in-line with the rest of the driver messages. Enhance those messages to output the alfanumeric model number as well. Signed-off-by: Henrique de Moraes Holschuh <hmh@hmh.eng.br> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/misc/thinkpad_acpi.c')
-rw-r--r--drivers/misc/thinkpad_acpi.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/misc/thinkpad_acpi.c b/drivers/misc/thinkpad_acpi.c
index cd263c518e06..601dbe8b407a 100644
--- a/drivers/misc/thinkpad_acpi.c
+++ b/drivers/misc/thinkpad_acpi.c
@@ -251,7 +251,8 @@ struct thinkpad_id_data {
251 u16 bios_model; /* Big Endian, TP-1Y = 0x5931, 0 = unknown */ 251 u16 bios_model; /* Big Endian, TP-1Y = 0x5931, 0 = unknown */
252 u16 ec_model; 252 u16 ec_model;
253 253
254 char *model_str; 254 char *model_str; /* ThinkPad T43 */
255 char *nummodel_str; /* 9384A9C for a 9384-A9C model */
255}; 256};
256static struct thinkpad_id_data thinkpad_id; 257static struct thinkpad_id_data thinkpad_id;
257 258
@@ -988,12 +989,14 @@ static int __init thinkpad_acpi_driver_init(struct ibm_init_struct *iibm)
988 thinkpad_id.ec_version_str : "unknown"); 989 thinkpad_id.ec_version_str : "unknown");
989 990
990 if (thinkpad_id.vendor && thinkpad_id.model_str) 991 if (thinkpad_id.vendor && thinkpad_id.model_str)
991 printk(TPACPI_INFO "%s %s\n", 992 printk(TPACPI_INFO "%s %s, model %s\n",
992 (thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ? 993 (thinkpad_id.vendor == PCI_VENDOR_ID_IBM) ?
993 "IBM" : ((thinkpad_id.vendor == 994 "IBM" : ((thinkpad_id.vendor ==
994 PCI_VENDOR_ID_LENOVO) ? 995 PCI_VENDOR_ID_LENOVO) ?
995 "Lenovo" : "Unknown vendor"), 996 "Lenovo" : "Unknown vendor"),
996 thinkpad_id.model_str); 997 thinkpad_id.model_str,
998 (thinkpad_id.nummodel_str) ?
999 thinkpad_id.nummodel_str : "unknown");
997 1000
998 return 0; 1001 return 0;
999} 1002}
@@ -5875,6 +5878,9 @@ static void __init get_thinkpad_model_data(struct thinkpad_id_data *tp)
5875 kfree(tp->model_str); 5878 kfree(tp->model_str);
5876 tp->model_str = NULL; 5879 tp->model_str = NULL;
5877 } 5880 }
5881
5882 tp->nummodel_str = kstrdup(dmi_get_system_info(DMI_PRODUCT_NAME),
5883 GFP_KERNEL);
5878} 5884}
5879 5885
5880static int __init probe_for_thinkpad(void) 5886static int __init probe_for_thinkpad(void)