# HG changeset patch
# User kaf24@scramble.cl.cam.ac.uk
# Date 1077629789 0
# Node ID 33e3adc72d8bf5f0d94ea4bb87de9ebf799773c3
# Parent  ff30aea0a1261dbeb5b0c62c682f8ff0e23c5e3d
bitkeeper revision 1.745 (403b535dxe-hvv9dM0KddL1LhR9pdQ)

e1000_main.c, cciss.c:
  Quieten unused device drivers in Xen.


diff -r ff30aea0a126 -r 33e3adc72d8b xen/drivers/block/cciss.c
--- a/xen/drivers/block/cciss.c	Tue Feb 24 12:07:53 2004 +0000
+++ b/xen/drivers/block/cciss.c	Tue Feb 24 13:36:29 2004 +0000
@@ -3415,10 +3415,10 @@ static struct pci_driver cciss_pci_drive
 */
 int __init cciss_init(void)
 {
-
-	printk(KERN_INFO DRIVER_NAME "\n");
-	/* Register for out PCI devices */
-	return pci_module_init(&cciss_pci_driver);
+	int ret = pci_module_init(&cciss_pci_driver);
+	if (ret >= 0)
+		printk(KERN_INFO DRIVER_NAME "\n");
+	return ret;
 }
 
 EXPORT_NO_SYMBOLS;
diff -r ff30aea0a126 -r 33e3adc72d8b xen/drivers/net/e1000/e1000_main.c
--- a/xen/drivers/net/e1000/e1000_main.c	Tue Feb 24 12:07:53 2004 +0000
+++ b/xen/drivers/net/e1000/e1000_main.c	Tue Feb 24 13:36:29 2004 +0000
@@ -219,13 +219,12 @@ static int __init
 e1000_init_module(void)
 {
 	int ret;
-	printk(KERN_INFO "%s - version %s\n",
-	       e1000_driver_string, e1000_driver_version);
-
-	printk(KERN_INFO "%s\n", e1000_copyright);
 
 	ret = pci_module_init(&e1000_driver);
 	if(ret >= 0) {
+		printk(KERN_INFO "%s - version %s\n",
+		       e1000_driver_string, e1000_driver_version);
+		printk(KERN_INFO "%s\n", e1000_copyright);
 		//register_reboot_notifier(&e1000_notifier_reboot);
 	}
 	return ret;