[SCSI] aacraid: Fix struct element name issue

Received from Mark Salyzyn,

This patch is to resolve a namespace issue that will result from a patch
expected in the future that adds a new interface; rationalized as
correcting a long term issue where hw_fib, instead of hw_fib_va, refers
to the virtual address space and hw_fib_pa refers to the physical
address space. A small fragment of this patch also cleans up an unused
variable that was close to the patch fragments.

Signed-off-by: Mark Haverkamp <markh@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/aacraid/dpcsup.c b/drivers/scsi/aacraid/dpcsup.c
index d38b628be1ad..26f4d563d959 100644
--- a/drivers/scsi/aacraid/dpcsup.c
+++ b/drivers/scsi/aacraid/dpcsup.c
@@ -73,7 +73,7 @@ unsigned int aac_response_normal(struct aac_queue * q)
                 u32 index = le32_to_cpu(entry->addr);
                 fast = index & 0x01;
                 fib = &dev->fibs[index >> 2];
-                hwfib = fib->hw_fib;
+                hwfib = fib->hw_fib_va;
                 
                 aac_consumer_free(dev, q, HostNormRespQueue);
                 /*
@@ -193,7 +193,7 @@ unsigned int aac_command_normal(struct aac_queue *q)
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
-                fib->hw_fib = hw_fib;
+                fib->hw_fib_va = hw_fib;
                 fib->data = hw_fib->data;
                 fib->dev = dev;
                 
@@ -259,7 +259,7 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
                 INIT_LIST_HEAD(&fib->fiblink);
                 fib->type = FSAFS_NTC_FIB_CONTEXT;
                 fib->size = sizeof(struct fib);
-                fib->hw_fib = hw_fib;
+                fib->hw_fib_va = hw_fib;
                 fib->data = hw_fib->data;
                 fib->dev = dev;
         
@@ -271,7 +271,7 @@ unsigned int aac_intr_normal(struct aac_dev * dev, u32 Index)
         } else {
                 int fast = index & 0x01;
                 struct fib * fib = &dev->fibs[index >> 2];
-                struct hw_fib * hwfib = fib->hw_fib;
+                struct hw_fib * hwfib = fib->hw_fib_va;
 
                 /*
                  *      Remove this fib from the Outstanding I/O queue.