Merge ssh://linux-scsi@linux-scsi.bkbits.net/scsi-misc-2.5

into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5

drivers/scsi/53c700.c

@@ -115,7 +115,6 @@
 #define NCR_700_VERSION "2.8"
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/string.h>

drivers/scsi/BusLogic.c

@@ -31,7 +31,6 @@
 #define BusLogic_DriverDate		"18 July 2002"
 
 #include <linux/config.h>
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>

drivers/scsi/aha152x.c

@@ -224,7 +224,6 @@
 #include <linux/sched.h>
 #include <asm/irq.h>
 #include <asm/io.h>
-#include <linux/version.h>
 #include <linux/blkdev.h>
 #include "scsi.h"
 #include "hosts.h"

drivers/scsi/dmx3191d.c

@@ -30,7 +30,6 @@
 #include <linux/sched.h>
 #include <linux/signal.h>
 #include <linux/stat.h>
-#include <linux/version.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 

drivers/scsi/i60uscsi.c

@@ -74,7 +74,6 @@
  *          - Fix allocation of scsi host structs and private data
  **************************************************************************/
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <asm/irq.h>
 #include <linux/pci.h>

drivers/scsi/ide-scsi.c

@@ -946,13 +946,6 @@ static Scsi_Host_Template idescsi_template = {
 	.proc_name		= "ide-scsi",
 };
 
-static struct device     idescsi_primary = {
-	.bus_id		= "ide-scsi",
-};
-static struct bus_type   idescsi_emu_bus = {
-	.name		= "ide-scsi",
-};
-
 static int idescsi_attach(ide_drive_t *drive)
 {
 	idescsi_scsi_t *idescsi;
@@ -975,7 +968,7 @@ static int idescsi_attach(ide_drive_t *drive)
 	if (!err) {
 		idescsi_setup (drive, idescsi);
 		drive->disk->fops = &idescsi_ops;
-		err = scsi_add_host(host, &idescsi_primary);
+		err = scsi_add_host(host, &drive->gendev);
 		if (!err) {
 			scsi_scan_host(host);
 			return 0;
@@ -990,27 +983,11 @@ static int idescsi_attach(ide_drive_t *drive)
 
 static int __init init_idescsi_module(void)
 {
-	int err;
-
-	err = bus_register(&idescsi_emu_bus);
-	if (!err) {
-		err = device_register(&idescsi_primary);
-		if (!err) {
-			err = ide_register_driver(&idescsi_driver);
-			if (!err)
-				return 0;
-
-			device_unregister(&idescsi_primary);
-		}
-		bus_unregister(&idescsi_emu_bus);
-	}
-	return err;
+	return ide_register_driver(&idescsi_driver);
 }
 
 static void __exit exit_idescsi_module(void)
 {
-	device_unregister(&idescsi_primary);
-	bus_unregister   (&idescsi_emu_bus);
 	ide_unregister_driver(&idescsi_driver);
 }
 

drivers/scsi/scsi_proc.c

@@ -85,11 +85,10 @@ void scsi_proc_hostdir_add(struct scsi_host_template *sht)
 	down(&global_host_template_sem);
 	if (!sht->present++) {
 		sht->proc_dir = proc_mkdir(sht->proc_name, proc_scsi);
-        	if (!sht->proc_dir) {
+        	if (!sht->proc_dir)
 			printk(KERN_ERR "%s: proc_mkdir failed for %s\n",
 			       __FUNCTION__, sht->proc_name);
-			return;
-		}
+		else
 			sht->proc_dir->owner = sht->module;
 	}
 	up(&global_host_template_sem);

drivers/scsi/sg.c

@@ -1514,8 +1514,10 @@ init_sg(void)
 	if (rc)
 		return rc;
 	rc = scsi_register_interface(&sg_interface);
-	if (rc)
+	if (rc) {
+		unregister_chrdev(SCSI_GENERIC_MAJOR, "sg");
 		return rc;
+	}
 #ifdef CONFIG_SCSI_PROC_FS
 	sg_proc_init();
 #endif				/* CONFIG_SCSI_PROC_FS */