lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] hpsa: remove unused busy_initializing and busy_scanning

Browse Source 
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Stephen M. Cameron
2011-10-26 16:20:58 -05:00
committed by James Bottomley
parent c0d6a4d17b
commit 03ab31f4c1
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/hpsa.c
View File

@@ -4121,7 +4121,6 @@ reinit_after_soft_reset:
return -ENOMEM; return -ENOMEM;
h->pdev = pdev; h->pdev = pdev;
h->busy_initializing = 1;
h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT; h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT;
INIT_LIST_HEAD(&h->cmpQ); INIT_LIST_HEAD(&h->cmpQ);
INIT_LIST_HEAD(&h->reqQ); INIT_LIST_HEAD(&h->reqQ);
@@ -4230,7 +4229,6 @@ reinit_after_soft_reset:
hpsa_hba_inquiry(h); hpsa_hba_inquiry(h);
hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
h->busy_initializing = 0;
return 1; return 1;
clean4: clean4:
@@ -4239,7 +4237,6 @@ clean4:
free_irq(h->intr[h->intr_mode], h); free_irq(h->intr[h->intr_mode], h);
clean2: clean2:
clean1: clean1:
h->busy_initializing = 0;
kfree(h); kfree(h);
return rc; return rc;
} }

2
drivers/scsi/hpsa.h
View File

@@ -95,8 +95,6 @@ struct ctlr_info {
unsigned long *cmd_pool_bits; unsigned long *cmd_pool_bits;
int nr_allocs; int nr_allocs;
int nr_frees; int nr_frees;
int busy_initializing;
int busy_scanning;
int scan_finished; int scan_finished;
spinlock_t scan_lock; spinlock_t scan_lock;
wait_queue_head_t scan_wait_queue; wait_queue_head_t scan_wait_queue;