1 files changed, 71 insertions, 61 deletions

diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 2e2362d787ca..502732ac270d 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -173,20 +173,20 @@ static struct pci_device_id dptids[] = {
 };
 MODULE_DEVICE_TABLE(pci,dptids);
 
-static int adpt_detect(struct scsi_host_template* sht)
+static void adpt_exit(void);
+
+static int adpt_detect(void)
 {
         struct pci_dev *pDev = NULL;
         adpt_hba* pHba;
 
-        adpt_init();
-
         PINFO("Detecting Adaptec I2O RAID controllers...\n");
 
         /* search for all Adatpec I2O RAID cards */
         while ((pDev = pci_get_device( PCI_DPT_VENDOR_ID, PCI_ANY_ID, pDev))) {
                 if(pDev->device == PCI_DPT_DEVICE_ID ||
                    pDev->device == PCI_DPT_RAPTOR_DEVICE_ID){
-                        if(adpt_install_hba(sht, pDev) ){
+                        if(adpt_install_hba(pDev) ){
                                 PERROR("Could not Init an I2O RAID device\n");
                                 PERROR("Will not try to detect others.\n");
                                 return hba_count-1;
@@ -248,34 +248,33 @@ rebuild_sys_tab:
         }
 
         for (pHba = hba_chain; pHba; pHba = pHba->next) {
-                if( adpt_scsi_register(pHba,sht) < 0){
+                if (adpt_scsi_register(pHba) < 0) {
                         adpt_i2o_delete_hba(pHba);
                         continue;
                 }
                 pHba->initialized = TRUE;
                 pHba->state &= ~DPTI_STATE_RESET;
+                scsi_scan_host(pHba->host);
         }
 
         // Register our control device node
         // nodes will need to be created in /dev to access this
         // the nodes can not be created from within the driver
         if (hba_count && register_chrdev(DPTI_I2O_MAJOR, DPT_DRIVER, &adpt_fops)) {
-                adpt_i2o_sys_shutdown();
+                adpt_exit();
                 return 0;
         }
         return hba_count;
 }
 
 
-/*
- * scsi_unregister will be called AFTER we return. 
- */
-static int adpt_release(struct Scsi_Host *host)
+static int adpt_release(adpt_hba *pHba)
 {
-        adpt_hba* pHba = (adpt_hba*) host->hostdata[0];
+        struct Scsi_Host *shost = pHba->host;
+        scsi_remove_host(shost);
 //      adpt_i2o_quiesce_hba(pHba);
         adpt_i2o_delete_hba(pHba);
-        scsi_unregister(host);
+        scsi_host_put(shost);
         return 0;
 }
 
@@ -882,7 +881,7 @@ static int adpt_reboot_event(struct notifier_block *n, ulong code, void *p)
 #endif
 
 
-static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev) 
+static int adpt_install_hba(struct pci_dev* pDev)
 {
 
         adpt_hba* pHba = NULL;
@@ -1031,8 +1030,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 
 
         mutex_lock(&adpt_configuration_lock);
-        // scsi_unregister calls our adpt_release which
-        // does a quiese
         if(pHba->host){
                 free_irq(pHba->host->irq, pHba);
         }
@@ -1084,17 +1081,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
 }
 
 
-static int adpt_init(void)
-{
-        printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
-#ifdef REBOOT_NOTIFIER
-        register_reboot_notifier(&adpt_reboot_notifier);
-#endif
-
-        return 0;
-}
-
-
 static struct adpt_device* adpt_find_device(adpt_hba* pHba, u32 chan, u32 id, u32 lun)
 {
         struct adpt_device* d;
@@ -2180,37 +2166,6 @@ static s32 adpt_scsi_to_i2o(adpt_hba* pHba, struct scsi_cmnd* cmd, struct adpt_d
 }
 
 
-static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht)
-{
-        struct Scsi_Host *host = NULL;
-
-        host = scsi_register(sht, sizeof(adpt_hba*));
-        if (host == NULL) {
-                printk ("%s: scsi_register returned NULL\n",pHba->name);
-                return -1;
-        }
-        host->hostdata[0] = (unsigned long)pHba;
-        pHba->host = host;
-
-        host->irq = pHba->pDev->irq;
-        /* no IO ports, so don't have to set host->io_port and 
-         * host->n_io_port
-         */
-        host->io_port = 0;
-        host->n_io_port = 0;
-                                /* see comments in scsi_host.h */
-        host->max_id = 16;
-        host->max_lun = 256;
-        host->max_channel = pHba->top_scsi_channel + 1;
-        host->cmd_per_lun = 1;
-        host->unique_id = (uint) pHba;
-        host->sg_tablesize = pHba->sg_tablesize;
-        host->can_queue = pHba->post_fifo_size;
-
-        return 0;
-}
-
-
 static s32 adpt_i2o_to_scsi(void __iomem *reply, struct scsi_cmnd* cmd)
 {
         adpt_hba* pHba;
@@ -3329,12 +3284,10 @@ static static void adpt_delay(int millisec)
 
 #endif
 
-static struct scsi_host_template driver_template = {
+static struct scsi_host_template adpt_template = {
         .name                   = "dpt_i2o",
         .proc_name              = "dpt_i2o",
         .proc_info              = adpt_proc_info,
-        .detect                 = adpt_detect,  
-        .release                = adpt_release,
         .info                   = adpt_info,
         .queuecommand           = adpt_queue,
         .eh_abort_handler       = adpt_abort,
@@ -3348,5 +3301,62 @@ static struct scsi_host_template driver_template = {
         .cmd_per_lun            = 1,
         .use_clustering         = ENABLE_CLUSTERING,
 };
-#include "scsi_module.c"
+
+static s32 adpt_scsi_register(adpt_hba* pHba)
+{
+        struct Scsi_Host *host;
+
+        host = scsi_host_alloc(&adpt_template, sizeof(adpt_hba*));
+        if (host == NULL) {
+                printk ("%s: scsi_host_alloc returned NULL\n",pHba->name);
+                return -1;
+        }
+        host->hostdata[0] = (unsigned long)pHba;
+        pHba->host = host;
+
+        host->irq = pHba->pDev->irq;
+        /* no IO ports, so don't have to set host->io_port and
+         * host->n_io_port
+         */
+        host->io_port = 0;
+        host->n_io_port = 0;
+                                /* see comments in scsi_host.h */
+        host->max_id = 16;
+        host->max_lun = 256;
+        host->max_channel = pHba->top_scsi_channel + 1;
+        host->cmd_per_lun = 1;
+        host->unique_id = (uint) pHba;
+        host->sg_tablesize = pHba->sg_tablesize;
+        host->can_queue = pHba->post_fifo_size;
+
+        if (scsi_add_host(host, &pHba->pDev->dev)) {
+                scsi_host_put(host);
+                return -1;
+        }
+
+        return 0;
+}
+
+static int __init adpt_init(void)
+{
+        int count;
+
+        printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
+#ifdef REBOOT_NOTIFIER
+        register_reboot_notifier(&adpt_reboot_notifier);
+#endif
+
+        count = adpt_detect();
+
+        return count > 0 ? 0 : -ENODEV;
+}
+
+static void __exit adpt_exit(void)
+{
+        while (hba_chain)
+                adpt_release(hba_chain);
+}
+
+module_init(adpt_init);
+module_exit(adpt_exit);
 MODULE_LICENSE("GPL");