diff options
| -rw-r--r-- | drivers/scsi/dpt_i2o.c | 16 | ||||
| -rw-r--r-- | drivers/scsi/dpti.h | 1 |
2 files changed, 4 insertions, 13 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index fd172b0890d3..3c667b23a801 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -302,16 +302,12 @@ rebuild_sys_tab: } -/* - * scsi_unregister will be called AFTER we return. - */ -static int adpt_release(struct Scsi_Host *host) +static void adpt_release(adpt_hba *pHba) { - adpt_hba* pHba = (adpt_hba*) host->hostdata[0]; + scsi_remove_host(pHba->host); // adpt_i2o_quiesce_hba(pHba); adpt_i2o_delete_hba(pHba); - scsi_unregister(host); - return 0; + scsi_host_put(pHba->host); } @@ -1087,8 +1083,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); } @@ -3595,11 +3589,9 @@ static void __exit adpt_exit(void) { adpt_hba *pHba, *next; - for (pHba = hba_chain; pHba; pHba = pHba->next) - scsi_remove_host(pHba->host); for (pHba = hba_chain; pHba; pHba = next) { next = pHba->next; - adpt_release(pHba->host); + adpt_release(pHba); } } diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h index 1fa345ab8ecb..dfc8d2eaa09e 100644 --- a/drivers/scsi/dpti.h +++ b/drivers/scsi/dpti.h @@ -32,7 +32,6 @@ static int adpt_detect(struct scsi_host_template * sht); static int adpt_queue(struct Scsi_Host *h, struct scsi_cmnd * cmd); static int adpt_abort(struct scsi_cmnd * cmd); static int adpt_reset(struct scsi_cmnd* cmd); -static int adpt_release(struct Scsi_Host *host); static int adpt_slave_configure(struct scsi_device *); static const char *adpt_info(struct Scsi_Host *pSHost); |