提交 23a2bc22 编写于 作者: B Benoit Boissinot 提交者: James Bottomley

[SCSI] drivers/scsi/dpt_i2o.c: cleanup useless code

This patch removes the array 'hbas' as it seems to be useless
and redundant with the linked list hbas_chain.
Signed-off-by: NBenoit Boissinot <benoit.boissinot@ens-lyon.org>
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>
上级 4833869e
...@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NULL; ...@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NULL;
static int sys_tbl_ind = 0; static int sys_tbl_ind = 0;
static int sys_tbl_len = 0; static int sys_tbl_len = 0;
static adpt_hba* hbas[DPTI_MAX_HBA];
static adpt_hba* hba_chain = NULL; static adpt_hba* hba_chain = NULL;
static int hba_count = 0; static int hba_count = 0;
...@@ -875,7 +874,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev ...@@ -875,7 +874,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
void __iomem *msg_addr_virt = NULL; void __iomem *msg_addr_virt = NULL;
int raptorFlag = FALSE; int raptorFlag = FALSE;
int i;
if(pci_enable_device(pDev)) { if(pci_enable_device(pDev)) {
return -EINVAL; return -EINVAL;
...@@ -935,12 +933,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev ...@@ -935,12 +933,6 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
memset(pHba, 0, sizeof(adpt_hba)); memset(pHba, 0, sizeof(adpt_hba));
down(&adpt_configuration_lock); down(&adpt_configuration_lock);
for(i=0;i<DPTI_MAX_HBA;i++) {
if(hbas[i]==NULL) {
hbas[i]=pHba;
break;
}
}
if(hba_chain != NULL){ if(hba_chain != NULL){
for(p = hba_chain; p->next; p = p->next); for(p = hba_chain; p->next; p = p->next);
...@@ -950,7 +942,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev ...@@ -950,7 +942,7 @@ static int adpt_install_hba(struct scsi_host_template* sht, struct pci_dev* pDev
} }
pHba->next = NULL; pHba->next = NULL;
pHba->unit = hba_count; pHba->unit = hba_count;
sprintf(pHba->name, "dpti%d", i); sprintf(pHba->name, "dpti%d", hba_count);
hba_count++; hba_count++;
up(&adpt_configuration_lock); up(&adpt_configuration_lock);
...@@ -1015,11 +1007,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba) ...@@ -1015,11 +1007,6 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
if(pHba->host){ if(pHba->host){
free_irq(pHba->host->irq, pHba); free_irq(pHba->host->irq, pHba);
} }
for(i=0;i<DPTI_MAX_HBA;i++) {
if(hbas[i]==pHba) {
hbas[i] = NULL;
}
}
p2 = NULL; p2 = NULL;
for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){ for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){
if(p1 == pHba) { if(p1 == pHba) {
...@@ -1076,12 +1063,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba) ...@@ -1076,12 +1063,7 @@ static void adpt_i2o_delete_hba(adpt_hba* pHba)
static int adpt_init(void) static int adpt_init(void)
{ {
int i;
printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n"); printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
for (i = 0; i < DPTI_MAX_HBA; i++) {
hbas[i] = NULL;
}
#ifdef REBOOT_NOTIFIER #ifdef REBOOT_NOTIFIER
register_reboot_notifier(&adpt_reboot_notifier); register_reboot_notifier(&adpt_reboot_notifier);
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册