diff options
author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2011-10-26 17:20:58 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-30 06:09:59 -0400 |
commit | 03ab31f4c14f259bfa160543c83dbfd93d6fb3e2 (patch) | |
tree | 9b97ab4ff1e2d0ce1f83f4d85a99f6f1694bbe78 /drivers/scsi | |
parent | c0d6a4d17b3848750b0285861b7a807811a0cfa6 (diff) |
[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: | |||
4121 | return -ENOMEM; | 4121 | return -ENOMEM; |
4122 | 4122 | ||
4123 | h->pdev = pdev; | 4123 | h->pdev = pdev; |
4124 | h->busy_initializing = 1; | ||
4125 | h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT; | 4124 | h->intr_mode = hpsa_simple_mode ? SIMPLE_MODE_INT : PERF_MODE_INT; |
4126 | INIT_LIST_HEAD(&h->cmpQ); | 4125 | INIT_LIST_HEAD(&h->cmpQ); |
4127 | INIT_LIST_HEAD(&h->reqQ); | 4126 | INIT_LIST_HEAD(&h->reqQ); |
@@ -4230,7 +4229,6 @@ reinit_after_soft_reset: | |||
4230 | 4229 | ||
4231 | hpsa_hba_inquiry(h); | 4230 | hpsa_hba_inquiry(h); |
4232 | hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ | 4231 | hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */ |
4233 | h->busy_initializing = 0; | ||
4234 | return 1; | 4232 | return 1; |
4235 | 4233 | ||
4236 | clean4: | 4234 | clean4: |
@@ -4239,7 +4237,6 @@ clean4: | |||
4239 | free_irq(h->intr[h->intr_mode], h); | 4237 | free_irq(h->intr[h->intr_mode], h); |
4240 | clean2: | 4238 | clean2: |
4241 | clean1: | 4239 | clean1: |
4242 | h->busy_initializing = 0; | ||
4243 | kfree(h); | 4240 | kfree(h); |
4244 | return rc; | 4241 | return rc; |
4245 | } | 4242 | } |
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 { | |||
95 | unsigned long *cmd_pool_bits; | 95 | unsigned long *cmd_pool_bits; |
96 | int nr_allocs; | 96 | int nr_allocs; |
97 | int nr_frees; | 97 | int nr_frees; |
98 | int busy_initializing; | ||
99 | int busy_scanning; | ||
100 | int scan_finished; | 98 | int scan_finished; |
101 | spinlock_t scan_lock; | 99 | spinlock_t scan_lock; |
102 | wait_queue_head_t scan_wait_queue; | 100 | wait_queue_head_t scan_wait_queue; |