[SCSI] aacraid: merge rx and rkt code

Received from Mark Salyzyn:

The only real difference between the rkt and rx platform modules is the
offset of the message registers. This patch recognizes this similarity
and simplifies the driver to reduce it's code footprint and to improve
maintainability by reducing the code duplication.

Visibly, the 'rkt.c' portion of this patch looks more complicated than
it really is. View it as retaining the rkt-only specifics of the
interface.

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

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index e5f7be6f3cd6..eb3ed91bac79 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -494,6 +494,7 @@ struct adapter_ops
         int  (*adapter_sync_cmd)(struct aac_dev *dev, u32 command, u32 p1, u32 p2, u32 p3, u32 p4, u32 p5, u32 p6, u32 *status, u32 *r1, u32 *r2, u32 *r3, u32 *r4);
         int  (*adapter_check_health)(struct aac_dev *dev);
         int  (*adapter_send)(struct fib * fib);
+        int  (*adapter_ioremap)(struct aac_dev * dev, u32 size);
 };
 
 /*
@@ -682,14 +683,6 @@ struct rx_inbound {
         __le32  Mailbox[8];
 };
 
-#define InboundMailbox0         IndexRegs.Mailbox[0]
-#define InboundMailbox1         IndexRegs.Mailbox[1]
-#define InboundMailbox2         IndexRegs.Mailbox[2]
-#define InboundMailbox3         IndexRegs.Mailbox[3]
-#define InboundMailbox4         IndexRegs.Mailbox[4]
-#define InboundMailbox5         IndexRegs.Mailbox[5]
-#define InboundMailbox6         IndexRegs.Mailbox[6]
-
 #define INBOUNDDOORBELL_0       0x00000001
 #define INBOUNDDOORBELL_1       0x00000002
 #define INBOUNDDOORBELL_2       0x00000004
@@ -1010,6 +1003,8 @@ struct aac_dev
                 struct rx_registers __iomem *rx;
                 struct rkt_registers __iomem *rkt;
         } regs;
+        volatile void __iomem *base;
+        volatile struct rx_inbound __iomem *IndexRegs;
         u32                     OIMR; /* Mask Register Cache */
         /*
          *      AIF thread states
@@ -1050,6 +1045,9 @@ struct aac_dev
 #define aac_adapter_send(fib) \
         ((fib)->dev)->a_ops.adapter_send(fib)
 
+#define aac_adapter_ioremap(dev, size) \
+        (dev)->a_ops.adapter_ioremap(dev, size)
+
 #define FIB_CONTEXT_FLAG_TIMED_OUT              (0x00000001)
 
 /*