vserver 2.0 rc7

[linux-2.6.git] / drivers / scsi / aacraid / rx.c

diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c
index df12f53..630b99e 100644 (file)
--- a/drivers/scsi/aacraid/rx.c
+++ b/drivers/scsi/aacraid/rx.c
@@ -94,7 +94,7 @@ static irqreturn_t aac_rx_intr(int irq, void *dev_id, struct pt_regs *regs)
  *     @p1: first parameter
  *     @ret: adapter status
  *
- *     This routine will send a synchronous comamnd to the adapter and wait 
+ *     This routine will send a synchronous command to the adapter and wait 
  *     for its completion.
  */
 
@@ -105,11 +105,11 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
        /*
         *      Write the command into Mailbox 0
         */
-       rx_writel(dev, InboundMailbox0, cpu_to_le32(command));
+       rx_writel(dev, InboundMailbox0, command);
        /*
         *      Write the parameters into Mailboxes 1 - 4
         */
-       rx_writel(dev, InboundMailbox1, cpu_to_le32(p1));
+       rx_writel(dev, InboundMailbox1, p1);
        rx_writel(dev, InboundMailbox2, 0);
        rx_writel(dev, InboundMailbox3, 0);
        rx_writel(dev, InboundMailbox4, 0);
@@ -167,7 +167,8 @@ static int rx_sync_cmd(struct aac_dev *dev, u32 command, u32 p1, u32 *status)
        /*
         *      Pull the synch status from Mailbox 0.
         */
-       *status = le32_to_cpu(rx_readl(dev, IndexRegs.Mailbox[0]));
+       if (status)
+               *status = rx_readl(dev, IndexRegs.Mailbox[0]);
        /*
         *      Clear the synch command doorbell.
         */
@@ -274,7 +275,7 @@ static void aac_rx_start_adapter(struct aac_dev *dev)
  */
 static int aac_rx_check_health(struct aac_dev *dev)
 {
-       u32 status = le32_to_cpu(rx_readl(dev, MUnit.OMRx[0]));
+       u32 status = rx_readl(dev, MUnit.OMRx[0]);
 
        /*
         *      Check to see if the board failed any self tests.
@@ -308,7 +309,7 @@ static int aac_rx_check_health(struct aac_dev *dev)
                memset(buffer, 0, 512);
                post->Post_Command = cpu_to_le32(COMMAND_POST_RESULTS);
                post->Post_Address = cpu_to_le32(baddr);
-               rx_writel(dev, MUnit.IMRx[0], cpu_to_le32(paddr));
+               rx_writel(dev, MUnit.IMRx[0], paddr);
                rx_sync_cmd(dev, COMMAND_POST_RESULTS, baddr, &status);
                pci_free_consistent(dev->pdev, sizeof(struct POSTSTATUS),
                  post, paddr);
@@ -388,8 +389,9 @@ int aac_rx_init(struct aac_dev *dev)
        {
                if(time_after(jiffies, start+180*HZ))
                {
-                       status = rx_readl(dev, IndexRegs.Mailbox[7]) >> 16;
-                       printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %ld.\n", dev->name, instance, status);
+                       status = rx_readl(dev, IndexRegs.Mailbox[7]);
+                       printk(KERN_ERR "%s%d: adapter kernel failed to start, init status = %lx.\n", 
+                                       dev->name, instance, status);
                        goto error_iounmap;
                }
                set_current_state(TASK_UNINTERRUPTIBLE);