patch-2.4.0-test3 linux/arch/arm/kernel/ecard.c

Next file: linux/arch/arm/kernel/hw-footbridge.c
Previous file: linux/arch/arm/kernel/dma.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test2/linux/arch/arm/kernel/ecard.c linux/arch/arm/kernel/ecard.c
@@ -33,9 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/mm.h>
 #include <linux/malloc.h>
-#include <linux/errno.h>
 #include <linux/proc_fs.h>
-#include <linux/unistd.h>
 #include <linux/init.h>
 
 #include <asm/dma.h>
@@ -913,7 +911,6 @@
 	ecard_t **ecp;
 	ecard_t *ec;
 	struct ex_ecid cid;
-	char buffer[200];
 	int i, rc = -ENOMEM;
 
 	ec = kmalloc(sizeof(ecard_t), GFP_KERNEL);
@@ -994,12 +991,9 @@
 nodev:
 	if (rc && ec)
 		kfree(ec);
-	else {
+	else
 		slot_to_expcard[slot] = ec;
 
-		ecard_prints(buffer, ec);
-		printk("%s", buffer);
-	}
 	return rc;
 }
 
@@ -1075,7 +1069,7 @@
 	init_waitqueue_head(&ecard_done);
 #endif
 
-	printk("Probing expansion cards: (does not imply support)\n");
+	printk("Probing expansion cards\n");
 
 	for (slot = 0; slot < 8; slot ++) {
 		if (ecard_probe(slot, ECARD_EASI) == -ENODEV)

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)