2005-04-23 18:12:34

by Benoit Boissinot

[permalink] [raw]
Subject: [2.6 PATCH] 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: Benoit Boissinot <[email protected]>

--- ./drivers/scsi/dpt_i2o.c.orig 2005-04-23 20:07:46.000000000 +0200
+++ ./drivers/scsi/dpt_i2o.c 2005-04-23 20:08:10.000000000 +0200
@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NUL
static int sys_tbl_ind = 0;
static int sys_tbl_len = 0;

-static adpt_hba* hbas[DPTI_MAX_HBA];
static adpt_hba* hba_chain = NULL;
static int hba_count = 0;

@@ -875,7 +874,6 @@ static int adpt_install_hba(struct scsi_
void __iomem *msg_addr_virt = NULL;

int raptorFlag = FALSE;
- int i;

if(pci_enable_device(pDev)) {
return -EINVAL;
@@ -935,12 +933,6 @@ static int adpt_install_hba(struct scsi_
memset(pHba, 0, sizeof(adpt_hba));

down(&adpt_configuration_lock);
- for(i=0;i<DPTI_MAX_HBA;i++) {
- if(hbas[i]==NULL) {
- hbas[i]=pHba;
- break;
- }
- }

if(hba_chain != NULL){
for(p = hba_chain; p->next; p = p->next);
@@ -950,7 +942,7 @@ static int adpt_install_hba(struct scsi_
}
pHba->next = NULL;
pHba->unit = hba_count;
- sprintf(pHba->name, "dpti%d", i);
+ sprintf(pHba->name, "dpti%d", hba_count);
hba_count++;

up(&adpt_configuration_lock);
@@ -1015,11 +1007,6 @@ static void adpt_i2o_delete_hba(adpt_hba
if(pHba->host){
free_irq(pHba->host->irq, pHba);
}
- for(i=0;i<DPTI_MAX_HBA;i++) {
- if(hbas[i]==pHba) {
- hbas[i] = NULL;
- }
- }
p2 = NULL;
for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){
if(p1 == pHba) {
@@ -1076,12 +1063,7 @@ static void adpt_i2o_delete_hba(adpt_hba

static int adpt_init(void)
{
- int i;
-
printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION "\n");
- for (i = 0; i < DPTI_MAX_HBA; i++) {
- hbas[i] = NULL;
- }
#ifdef REBOOT_NOTIFIER
register_reboot_notifier(&adpt_reboot_notifier);
#endif


2005-04-25 11:47:52

by Mark Salyzyn

[permalink] [raw]
Subject: RE: [2.6 PATCH] drivers/scsi/dpt_i2o.c: cleanup useless code

I approve, applied to Adaptec branch.

Sincerely -- Mark Salyzyn

-----Original Message-----
From: Benoit Boissinot [mailto:[email protected]]
Sent: Saturday, April 23, 2005 2:12 PM
To: Andrew Morton
Cc: [email protected]; [email protected];
[email protected]; Markus Lidel; Salyzyn, Mark
Subject: [2.6 PATCH] 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: Benoit Boissinot <[email protected]>

--- ./drivers/scsi/dpt_i2o.c.orig 2005-04-23 20:07:46.000000000
+0200
+++ ./drivers/scsi/dpt_i2o.c 2005-04-23 20:08:10.000000000 +0200
@@ -113,7 +113,6 @@ static struct i2o_sys_tbl *sys_tbl = NUL
static int sys_tbl_ind = 0;
static int sys_tbl_len = 0;

-static adpt_hba* hbas[DPTI_MAX_HBA];
static adpt_hba* hba_chain = NULL;
static int hba_count = 0;

@@ -875,7 +874,6 @@ static int adpt_install_hba(struct scsi_
void __iomem *msg_addr_virt = NULL;

int raptorFlag = FALSE;
- int i;

if(pci_enable_device(pDev)) {
return -EINVAL;
@@ -935,12 +933,6 @@ static int adpt_install_hba(struct scsi_
memset(pHba, 0, sizeof(adpt_hba));

down(&adpt_configuration_lock);
- for(i=0;i<DPTI_MAX_HBA;i++) {
- if(hbas[i]==NULL) {
- hbas[i]=pHba;
- break;
- }
- }

if(hba_chain != NULL){
for(p = hba_chain; p->next; p = p->next);
@@ -950,7 +942,7 @@ static int adpt_install_hba(struct scsi_
}
pHba->next = NULL;
pHba->unit = hba_count;
- sprintf(pHba->name, "dpti%d", i);
+ sprintf(pHba->name, "dpti%d", hba_count);
hba_count++;

up(&adpt_configuration_lock);
@@ -1015,11 +1007,6 @@ static void adpt_i2o_delete_hba(adpt_hba
if(pHba->host){
free_irq(pHba->host->irq, pHba);
}
- for(i=0;i<DPTI_MAX_HBA;i++) {
- if(hbas[i]==pHba) {
- hbas[i] = NULL;
- }
- }
p2 = NULL;
for( p1 = hba_chain; p1; p2 = p1,p1=p1->next){
if(p1 == pHba) {
@@ -1076,12 +1063,7 @@ static void adpt_i2o_delete_hba(adpt_hba

static int adpt_init(void)
{
- int i;
-
printk("Loading Adaptec I2O RAID: Version " DPT_I2O_VERSION
"\n");
- for (i = 0; i < DPTI_MAX_HBA; i++) {
- hbas[i] = NULL;
- }
#ifdef REBOOT_NOTIFIER
register_reboot_notifier(&adpt_reboot_notifier);
#endif