aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Panin <pazke@donpac.ru>2005-09-06 18:18:28 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 19:57:44 -0400
commit4e70b9a3d68909ad7e79bf6e1b0dcec6de922a7c (patch)
tree8439e9fd40614401e2434a0240adb2d3432e0804
parent61e032fa2f659fada02ede5087b46963a1c7de34 (diff)
[PATCH] dmi: remove old debugging code
DMI debugging code is unused for ages. This patch removes it. Signed-off-by: Andrey Panin <pazke@donpac.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/kernel/dmi_scan.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index 6ae4ef472dbf..ecdaae262755 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -12,13 +12,6 @@ struct dmi_header {
12 u16 handle; 12 u16 handle;
13}; 13};
14 14
15#undef DMI_DEBUG
16
17#ifdef DMI_DEBUG
18#define dmi_printk(x) printk x
19#else
20#define dmi_printk(x)
21#endif
22 15
23static char * __init dmi_string(struct dmi_header *dm, u8 s) 16static char * __init dmi_string(struct dmi_header *dm, u8 s)
24{ 17{
@@ -117,29 +110,19 @@ static void __init dmi_decode(struct dmi_header *dm)
117 110
118 switch(dm->type) { 111 switch(dm->type) {
119 case 0: 112 case 0:
120 dmi_printk(("BIOS Vendor: %s\n", dmi_string(dm, data[4])));
121 dmi_save_ident(dm, DMI_BIOS_VENDOR, 4); 113 dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
122 dmi_printk(("BIOS Version: %s\n", dmi_string(dm, data[5])));
123 dmi_save_ident(dm, DMI_BIOS_VERSION, 5); 114 dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
124 dmi_printk(("BIOS Release: %s\n", dmi_string(dm, data[8])));
125 dmi_save_ident(dm, DMI_BIOS_DATE, 8); 115 dmi_save_ident(dm, DMI_BIOS_DATE, 8);
126 break; 116 break;
127 case 1: 117 case 1:
128 dmi_printk(("System Vendor: %s\n", dmi_string(dm, data[4])));
129 dmi_save_ident(dm, DMI_SYS_VENDOR, 4); 118 dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
130 dmi_printk(("Product Name: %s\n", dmi_string(dm, data[5])));
131 dmi_save_ident(dm, DMI_PRODUCT_NAME, 5); 119 dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
132 dmi_printk(("Version: %s\n", dmi_string(dm, data[6])));
133 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6); 120 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
134 dmi_printk(("Serial Number: %s\n", dmi_string(dm, data[7])));
135 dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7); 121 dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
136 break; 122 break;
137 case 2: 123 case 2:
138 dmi_printk(("Board Vendor: %s\n", dmi_string(dm, data[4])));
139 dmi_save_ident(dm, DMI_BOARD_VENDOR, 4); 124 dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
140 dmi_printk(("Board Name: %s\n", dmi_string(dm, data[5])));
141 dmi_save_ident(dm, DMI_BOARD_NAME, 5); 125 dmi_save_ident(dm, DMI_BOARD_NAME, 5);
142 dmi_printk(("Board Version: %s\n", dmi_string(dm, data[6])));
143 dmi_save_ident(dm, DMI_BOARD_VERSION, 6); 126 dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
144 break; 127 break;
145 } 128 }
@@ -177,10 +160,6 @@ void __init dmi_scan_machine(void)
177 else 160 else
178 printk(KERN_INFO "DMI present.\n"); 161 printk(KERN_INFO "DMI present.\n");
179 162
180 dmi_printk((KERN_INFO "%d structures occupying %d bytes.\n",
181 num, len));
182 dmi_printk((KERN_INFO "DMI table at 0x%08X.\n", base));
183
184 if (dmi_table(base,len, num, dmi_decode) == 0) 163 if (dmi_table(base,len, num, dmi_decode) == 0)
185 return; 164 return;
186 } 165 }