[PATCH 1/5] 2.6.13-rc5-mm1, remove old debugging code

2005-08-10 Thread Andrey Panin

DMI debugging code is unused for ages. This patch removes it.

Signed-off-by: Andrey Panin <[EMAIL PROTECTED]>

 arch/i386/kernel/dmi_scan.c |   21 -
 1 files changed, 21 deletions(-)

diff -urdpNX /usr/share/dontdiff 
linux-2.6.13-rc5-mm1.vanilla/arch/i386/kernel/dmi_scan.c 
linux-2.6.13-rc5-mm1/arch/i386/kernel/dmi_scan.c
--- linux-2.6.13-rc5-mm1.vanilla/arch/i386/kernel/dmi_scan.c2005-06-14 
23:24:54.0 +0400
+++ linux-2.6.13-rc5-mm1/arch/i386/kernel/dmi_scan.c2005-06-14 
23:25:07.0 +0400
@@ -12,13 +12,6 @@ struct dmi_header {
u16 handle;
 };
 
-#undef DMI_DEBUG
-
-#ifdef DMI_DEBUG
-#define dmi_printk(x) printk x
-#else
-#define dmi_printk(x)
-#endif
 
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
@@ -117,29 +110,19 @@ static void __init dmi_decode(struct dmi

switch(dm->type) {
case  0:
-   dmi_printk(("BIOS Vendor: %s\n", dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
-   dmi_printk(("BIOS Version: %s\n", dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
-   dmi_printk(("BIOS Release: %s\n", dmi_string(dm, data[8])));
dmi_save_ident(dm, DMI_BIOS_DATE, 8);
break;
case 1:
-   dmi_printk(("System Vendor: %s\n", dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
-   dmi_printk(("Product Name: %s\n", dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
-   dmi_printk(("Version: %s\n", dmi_string(dm, data[6])));
dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
-   dmi_printk(("Serial Number: %s\n", dmi_string(dm, data[7])));
dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
break;
case 2:
-   dmi_printk(("Board Vendor: %s\n", dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
-   dmi_printk(("Board Name: %s\n", dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_BOARD_NAME, 5);
-   dmi_printk(("Board Version: %s\n", dmi_string(dm, data[6])));
dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
break;
}
@@ -177,10 +160,6 @@ void __init dmi_scan_machine(void)
else
printk(KERN_INFO "DMI present.\n");
 
-   dmi_printk((KERN_INFO "%d structures occupying %d 
bytes.\n",
-   num, len));
-   dmi_printk((KERN_INFO "DMI table at 0x%08X.\n", base));
-
if (dmi_table(base,len, num, dmi_decode) == 0)
return;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[PATCH 1/5] 2.6.13-rc5-mm1, remove old debugging code

2005-08-10 Thread Andrey Panin

DMI debugging code is unused for ages. This patch removes it.

Signed-off-by: Andrey Panin [EMAIL PROTECTED]

 arch/i386/kernel/dmi_scan.c |   21 -
 1 files changed, 21 deletions(-)

diff -urdpNX /usr/share/dontdiff 
linux-2.6.13-rc5-mm1.vanilla/arch/i386/kernel/dmi_scan.c 
linux-2.6.13-rc5-mm1/arch/i386/kernel/dmi_scan.c
--- linux-2.6.13-rc5-mm1.vanilla/arch/i386/kernel/dmi_scan.c2005-06-14 
23:24:54.0 +0400
+++ linux-2.6.13-rc5-mm1/arch/i386/kernel/dmi_scan.c2005-06-14 
23:25:07.0 +0400
@@ -12,13 +12,6 @@ struct dmi_header {
u16 handle;
 };
 
-#undef DMI_DEBUG
-
-#ifdef DMI_DEBUG
-#define dmi_printk(x) printk x
-#else
-#define dmi_printk(x)
-#endif
 
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
@@ -117,29 +110,19 @@ static void __init dmi_decode(struct dmi

switch(dm-type) {
case  0:
-   dmi_printk((BIOS Vendor: %s\n, dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
-   dmi_printk((BIOS Version: %s\n, dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
-   dmi_printk((BIOS Release: %s\n, dmi_string(dm, data[8])));
dmi_save_ident(dm, DMI_BIOS_DATE, 8);
break;
case 1:
-   dmi_printk((System Vendor: %s\n, dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
-   dmi_printk((Product Name: %s\n, dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
-   dmi_printk((Version: %s\n, dmi_string(dm, data[6])));
dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
-   dmi_printk((Serial Number: %s\n, dmi_string(dm, data[7])));
dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
break;
case 2:
-   dmi_printk((Board Vendor: %s\n, dmi_string(dm, data[4])));
dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
-   dmi_printk((Board Name: %s\n, dmi_string(dm, data[5])));
dmi_save_ident(dm, DMI_BOARD_NAME, 5);
-   dmi_printk((Board Version: %s\n, dmi_string(dm, data[6])));
dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
break;
}
@@ -177,10 +160,6 @@ void __init dmi_scan_machine(void)
else
printk(KERN_INFO DMI present.\n);
 
-   dmi_printk((KERN_INFO %d structures occupying %d 
bytes.\n,
-   num, len));
-   dmi_printk((KERN_INFO DMI table at 0x%08X.\n, base));
-
if (dmi_table(base,len, num, dmi_decode) == 0)
return;
}

-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/