1 files changed, 24 insertions, 26 deletions

diff --git a/drivers/message/i2o/i2o_scsi.c b/drivers/message/i2o/i2o_scsi.c
index 9f1744c3933b..7a784fd60804 100644
--- a/drivers/message/i2o/i2o_scsi.c
+++ b/drivers/message/i2o/i2o_scsi.c
@@ -510,8 +510,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
         struct i2o_controller *c;
         struct i2o_device *i2o_dev;
         int tid;
-        struct i2o_message __iomem *msg;
-        u32 m;
+        struct i2o_message *msg;
         /*
          * ENABLE_DISCONNECT
          * SIMPLE_TAG
@@ -519,7 +518,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
          */
         u32 scsi_flags = 0x20a00000;
         u32 sgl_offset;
-        u32 __iomem *mptr;
+        u32 *mptr;
         u32 cmd = I2O_CMD_SCSI_EXEC << 24;
         int rc = 0;
 
@@ -576,8 +575,8 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
          *      throw it back to the scsi layer
          */
 
-        m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_MESSAGE_GET);
-        if (m == I2O_QUEUE_EMPTY) {
+        msg = i2o_msg_get(c);
+        if (IS_ERR(msg)) {
                 rc = SCSI_MLQUEUE_HOST_BUSY;
                 goto exit;
         }
@@ -617,16 +616,16 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
                 if (sgl_offset == SGL_OFFSET_10)
                         sgl_offset = SGL_OFFSET_12;
                 cmd = I2O_CMD_PRIVATE << 24;
-                writel(I2O_VENDOR_DPT << 16 | I2O_CMD_SCSI_EXEC, mptr++);
-                writel(adpt_flags | tid, mptr++);
+                *mptr++ = cpu_to_le32(I2O_VENDOR_DPT << 16 | I2O_CMD_SCSI_EXEC);
+                *mptr++ = cpu_to_le32(adpt_flags | tid);
         }
 #endif
 
-        writel(cmd | HOST_TID << 12 | tid, &msg->u.head[1]);
-        writel(i2o_scsi_driver.context, &msg->u.s.icntxt);
+        msg->u.head[1] = cpu_to_le32(cmd | HOST_TID << 12 | tid);
+        msg->u.s.icntxt = cpu_to_le32(i2o_scsi_driver.context);
 
         /* We want the SCSI control block back */
-        writel(i2o_cntxt_list_add(c, SCpnt), &msg->u.s.tcntxt);
+        msg->u.s.tcntxt = cpu_to_le32(i2o_cntxt_list_add(c, SCpnt));
 
         /* LSI_920_PCI_QUIRK
          *
@@ -649,15 +648,15 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
            }
          */
 
-        writel(scsi_flags | SCpnt->cmd_len, mptr++);
+        *mptr++ = cpu_to_le32(scsi_flags | SCpnt->cmd_len);
 
         /* Write SCSI command into the message - always 16 byte block */
-        memcpy_toio(mptr, SCpnt->cmnd, 16);
+        memcpy(mptr, SCpnt->cmnd, 16);
         mptr += 4;
 
         if (sgl_offset != SGL_OFFSET_0) {
                 /* write size of data addressed by SGL */
-                writel(SCpnt->request_bufflen, mptr++);
+                *mptr++ = cpu_to_le32(SCpnt->request_bufflen);
 
                 /* Now fill in the SGList and command */
                 if (SCpnt->use_sg) {
@@ -676,11 +675,11 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
         }
 
         /* Stick the headers on */
-        writel(I2O_MESSAGE_SIZE(mptr - &msg->u.head[0]) | sgl_offset,
-               &msg->u.head[0]);
+        msg->u.head[0] =
+            cpu_to_le32(I2O_MESSAGE_SIZE(mptr - &msg->u.head[0]) | sgl_offset);
 
         /* Queue the message */
-        i2o_msg_post(c, m);
+        i2o_msg_post(c, msg);
 
         osm_debug("Issued %ld\n", SCpnt->serial_number);
 
@@ -688,7 +687,7 @@ static int i2o_scsi_queuecommand(struct scsi_cmnd *SCpnt,
 
       nomem:
         rc = -ENOMEM;
-        i2o_msg_nop(c, m);
+        i2o_msg_nop(c, msg);
 
       exit:
         return rc;
@@ -709,8 +708,7 @@ static int i2o_scsi_abort(struct scsi_cmnd *SCpnt)
 {
         struct i2o_device *i2o_dev;
         struct i2o_controller *c;
-        struct i2o_message __iomem *msg;
-        u32 m;
+        struct i2o_message *msg;
         int tid;
         int status = FAILED;
 
@@ -720,16 +718,16 @@ static int i2o_scsi_abort(struct scsi_cmnd *SCpnt)
         c = i2o_dev->iop;
         tid = i2o_dev->lct_data.tid;
 
-        m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_MESSAGE_GET);
-        if (m == I2O_QUEUE_EMPTY)
+        msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
+        if (IS_ERR(msg))
                 return SCSI_MLQUEUE_HOST_BUSY;
 
-        writel(FIVE_WORD_MSG_SIZE | SGL_OFFSET_0, &msg->u.head[0]);
-        writel(I2O_CMD_SCSI_ABORT << 24 | HOST_TID << 12 | tid,
-               &msg->u.head[1]);
-        writel(i2o_cntxt_list_get_ptr(c, SCpnt), &msg->body[0]);
+        msg->u.head[0] = cpu_to_le32(FIVE_WORD_MSG_SIZE | SGL_OFFSET_0);
+        msg->u.head[1] =
+            cpu_to_le32(I2O_CMD_SCSI_ABORT << 24 | HOST_TID << 12 | tid);
+        msg->body[0] = cpu_to_le32(i2o_cntxt_list_get_ptr(c, SCpnt));
 
-        if (i2o_msg_post_wait(c, m, I2O_TIMEOUT_SCSI_SCB_ABORT))
+        if (i2o_msg_post_wait(c, msg, I2O_TIMEOUT_SCSI_SCB_ABORT))
                 status = SUCCESS;
 
         return status;