aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Haverkamp <markh@osdl.org>2006-05-10 12:13:37 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2006-05-20 10:23:02 -0400
commit5b9851b5511833a96fea2196971b5709ef019136 (patch)
treefd87212b1f9efb9db1f8bea67e6b3c204e1ac955
parentdf3b7668715f9acfe6ff37dd886f68e46ccd677e (diff)
[SCSI] aacraid: remove unneeded list
Received From Mark Salyzyn The queue tracking is just not being used, not even for debugging. Information about outstanding commands can be acquired from the scsi structures. Signed-off-by: Mark Haverkamp <markh@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/aacraid/aacraid.h2
-rw-r--r--drivers/scsi/aacraid/comminit.c1
-rw-r--r--drivers/scsi/aacraid/commsup.c4
-rw-r--r--drivers/scsi/aacraid/dpcsup.c2
4 files changed, 0 insertions, 9 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index ff5c380eae36..e6b41dbbec82 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -563,7 +563,6 @@ struct aac_queue {
563 spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */ 563 spinlock_t lockdata; /* Actual lock (used only on one side of the lock) */
564 struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */ 564 struct list_head cmdq; /* A queue of FIBs which need to be prcessed by the FS thread. This is */
565 /* only valid for command queues which receive entries from the adapter. */ 565 /* only valid for command queues which receive entries from the adapter. */
566 struct list_head pendingq; /* A queue of outstanding fib's to the adapter. */
567 u32 numpending; /* Number of entries on outstanding queue. */ 566 u32 numpending; /* Number of entries on outstanding queue. */
568 struct aac_dev * dev; /* Back pointer to adapter structure */ 567 struct aac_dev * dev; /* Back pointer to adapter structure */
569}; 568};
@@ -826,7 +825,6 @@ struct fib {
826 * The following is used to put this fib context onto the 825 * The following is used to put this fib context onto the
827 * Outstanding I/O queue. 826 * Outstanding I/O queue.
828 */ 827 */
829 struct list_head queue;
830 /* 828 /*
831 * And for the internal issue/reply queues (we may be able 829 * And for the internal issue/reply queues (we may be able
832 * to merge these two) 830 * to merge these two)
diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
index 19397453bae7..1d43c17642c0 100644
--- a/drivers/scsi/aacraid/comminit.c
+++ b/drivers/scsi/aacraid/comminit.c
@@ -159,7 +159,6 @@ static void aac_queue_init(struct aac_dev * dev, struct aac_queue * q, u32 *mem,
159{ 159{
160 q->numpending = 0; 160 q->numpending = 0;
161 q->dev = dev; 161 q->dev = dev;
162 INIT_LIST_HEAD(&q->pendingq);
163 init_waitqueue_head(&q->cmdready); 162 init_waitqueue_head(&q->cmdready);
164 INIT_LIST_HEAD(&q->cmdq); 163 INIT_LIST_HEAD(&q->cmdq);
165 init_waitqueue_head(&q->qfull); 164 init_waitqueue_head(&q->qfull);
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1c83af3d0f3d..d2ef17ea44fa 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -472,7 +472,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
472 spin_lock_irqsave(q->lock, qflags); 472 spin_lock_irqsave(q->lock, qflags);
473 if (dev->new_comm_interface) { 473 if (dev->new_comm_interface) {
474 unsigned long count = 10000000L; /* 50 seconds */ 474 unsigned long count = 10000000L; /* 50 seconds */
475 list_add_tail(&fibptr->queue, &q->pendingq);
476 q->numpending++; 475 q->numpending++;
477 spin_unlock_irqrestore(q->lock, qflags); 476 spin_unlock_irqrestore(q->lock, qflags);
478 while (aac_adapter_send(fibptr) != 0) { 477 while (aac_adapter_send(fibptr) != 0) {
@@ -481,7 +480,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
481 spin_unlock_irqrestore(&fibptr->event_lock, flags); 480 spin_unlock_irqrestore(&fibptr->event_lock, flags);
482 spin_lock_irqsave(q->lock, qflags); 481 spin_lock_irqsave(q->lock, qflags);
483 q->numpending--; 482 q->numpending--;
484 list_del(&fibptr->queue);
485 spin_unlock_irqrestore(q->lock, qflags); 483 spin_unlock_irqrestore(q->lock, qflags);
486 return -ETIMEDOUT; 484 return -ETIMEDOUT;
487 } 485 }
@@ -492,7 +490,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
492 unsigned long nointr = 0; 490 unsigned long nointr = 0;
493 aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr); 491 aac_queue_get( dev, &index, AdapNormCmdQueue, hw_fib, 1, fibptr, &nointr);
494 492
495 list_add_tail(&fibptr->queue, &q->pendingq);
496 q->numpending++; 493 q->numpending++;
497 *(q->headers.producer) = cpu_to_le32(index + 1); 494 *(q->headers.producer) = cpu_to_le32(index + 1);
498 spin_unlock_irqrestore(q->lock, qflags); 495 spin_unlock_irqrestore(q->lock, qflags);
@@ -520,7 +517,6 @@ int aac_fib_send(u16 command, struct fib *fibptr, unsigned long size,
520 if (--count == 0) { 517 if (--count == 0) {
521 spin_lock_irqsave(q->lock, qflags); 518 spin_lock_irqsave(q->lock, qflags);
522 q->numpending--; 519 q->numpending--;
523 list_del(&fibptr->queue);
524 spin_unlock_irqrestore(q->lock, qflags); 520 spin_unlock_irqrestore(q->lock, qflags);
525 if (wait == -1) { 521 if (wait == -1) {
526 printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n" 522 printk(KERN_ERR "aacraid: aac_fib_send: first asynchronous command timed out.\n"
diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index f6bcb9486f85..bd6a67dd2506 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -86,7 +86,6 @@ unsigned int aac_response_normal(struct aac_queue * q)
86 * the fib timed out. 86 * the fib timed out.
87 */ 87 */
88 if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) { 88 if (!(fib->flags & FIB_CONTEXT_FLAG_TIMED_OUT)) {
89 list_del(&fib->queue);
90 dev->queues->queue[AdapNormCmdQueue].numpending--; 89 dev->queues->queue[AdapNormCmdQueue].numpending--;
91 } else { 90 } else {
92 printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags); 91 printk(KERN_WARNING "aacraid: FIB timeout (%x).\n", fib->flags);
@@ -284,7 +283,6 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
284 return 0; 283 return 0;
285 } 284 }
286 285
287 list_del(&fib->queue);
288 dev->queues->queue[AdapNormCmdQueue].numpending--; 286 dev->queues->queue[AdapNormCmdQueue].numpending--;
289 287
290 if (fast) { 288 if (fast) {