aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/aacraid/aacraid.h
diff options
context:
space:
mode:
authorMark Haverkamp <markh@linux-foundation.org>2007-03-15 13:26:22 -0400
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>2007-03-20 11:54:25 -0400
commita8166a52968216ae079a5530ac3269147de2ef31 (patch)
treedff8f68e062c91cdf0f2003ccf8eb606bdcaa02d /drivers/scsi/aacraid/aacraid.h
parent8418852d11f0bbaeebeedd4243560d8fdc85410d (diff)
[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>
Diffstat (limited to 'drivers/scsi/aacraid/aacraid.h')
-rw-r--r--drivers/scsi/aacraid/aacraid.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index 7e25c0bbd644..9ca594b33d1c 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -834,7 +834,7 @@ struct fib {
834 */ 834 */
835 struct list_head fiblink; 835 struct list_head fiblink;
836 void *data; 836 void *data;
837 struct hw_fib *hw_fib; /* Actual shared object */ 837 struct hw_fib *hw_fib_va; /* Actual shared object */
838 dma_addr_t hw_fib_pa; /* physical address of hw_fib*/ 838 dma_addr_t hw_fib_pa; /* physical address of hw_fib*/
839}; 839};
840 840
@@ -1821,7 +1821,7 @@ int aac_fib_send(u16 command, struct fib * context, unsigned long size, int prio
1821int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry); 1821int aac_consumer_get(struct aac_dev * dev, struct aac_queue * q, struct aac_entry **entry);
1822void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum); 1822void aac_consumer_free(struct aac_dev * dev, struct aac_queue * q, u32 qnum);
1823int aac_fib_complete(struct fib * context); 1823int aac_fib_complete(struct fib * context);
1824#define fib_data(fibctx) ((void *)(fibctx)->hw_fib->data) 1824#define fib_data(fibctx) ((void *)(fibctx)->hw_fib_va->data)
1825struct aac_dev *aac_init_adapter(struct aac_dev *dev); 1825struct aac_dev *aac_init_adapter(struct aac_dev *dev);
1826int aac_get_config_status(struct aac_dev *dev, int commit_flag); 1826int aac_get_config_status(struct aac_dev *dev, int commit_flag);
1827int aac_get_containers(struct aac_dev *dev); 1827int aac_get_containers(struct aac_dev *dev);