diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-10-26 16:20:58 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-30 14:09:59 +0400 |
| commit | 03ab31f4c14f259bfa160543c83dbfd93d6fb3e2 (patch) | |
| tree | 9b97ab4ff1e2d0ce1f83f4d85a99f6f1694bbe78 /drivers/scsi | |
| parent | c0d6a4d17b3848750b0285861b7a807811a0cfa6 (diff) | |
| download | linux-03ab31f4c14f259bfa160543c83dbfd93d6fb3e2.tar.gz | |
[SCSI] hpsa: remove unused busy_initializing and busy_scanning
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/hpsa.c | 3 | ||||
| -rw-r--r-- | drivers/scsi/hpsa.h | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 43a882bc751d..c89bed12cb55 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -4121,7 +4121,6 @@ reinit_after_soft_reset: return -ENOMEM; h->pdev = pdev; - h->busy_initializing = 1; h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT; INIT_LIST_HEAD(&h->cmpQ); INIT_LIST_HEAD(&h->reqQ); @@ -4230,7 +4229,6 @@ reinit_after_soft_reset: hpsa_hba_inquiry(h); hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ - h->busy_initializing = 0; return 1; clean4: @@ -4239,7 +4237,6 @@ clean4: free_irq(h->intr[h->intr_mode], h); clean2: clean1: - h->busy_initializing = 0; kfree(h); return rc; } diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h index 7f53ceaa7239..111b79e32b2b 100644 --- a/drivers/scsi/hpsa.h +++ b/drivers/scsi/hpsa.h @@ -95,8 +95,6 @@ struct ctlr_info { unsigned long *cmd_pool_bits; int nr_allocs; int nr_frees; - int busy_initializing; - int busy_scanning; int scan_finished; spinlock_t scan_lock; wait_queue_head_t scan_wait_queue; |