Merge branch 'linus' into x86/amd-iommu

[linux-2.6] / drivers / scsi / arm / fas216.c

diff --git a/drivers/scsi/arm/fas216.c b/drivers/scsi/arm/fas216.c
index e05f0c2fc9123a7948216d785c0c6d36e172b533..a715632e19d472ec61956f87c12a1c61f8fbc4a5 100644 (file)
--- a/drivers/scsi/arm/fas216.c
+++ b/drivers/scsi/arm/fas216.c
@@ -39,7 +39,6 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/ioport.h>
-#include <linux/sched.h>
 #include <linux/proc_fs.h>
 #include <linux/delay.h>
 #include <linux/bitops.h>
@@ -634,7 +633,7 @@ static void fas216_updateptrs(FAS216_Info *info, int bytes_transferred)
 
        BUG_ON(bytes_transferred < 0);
 
-       info->SCpnt->request_bufflen -= bytes_transferred;
+       SCp->phase -= bytes_transferred;
 
        while (bytes_transferred != 0) {
                if (SCp->this_residual > bytes_transferred)
@@ -716,7 +715,7 @@ static void fas216_cleanuptransfer(FAS216_Info *info)
                return;
 
        if (dmatype == fasdma_real_all)
-               total = info->SCpnt->request_bufflen;
+               total = info->scsi.SCp.phase;
        else
                total = info->scsi.SCp.this_residual;
 
@@ -754,7 +753,7 @@ static void fas216_transfer(FAS216_Info *info)
        fas216_log(info, LOG_BUFFER,
                   "starttransfer: buffer %p length 0x%06x reqlen 0x%06x",
                   info->scsi.SCp.ptr, info->scsi.SCp.this_residual,
-                  info->SCpnt->request_bufflen);
+                  info->scsi.SCp.phase);
 
        if (!info->scsi.SCp.ptr) {
                fas216_log(info, LOG_ERROR, "null buffer passed to "
@@ -785,7 +784,7 @@ static void fas216_transfer(FAS216_Info *info)
        info->dma.transfer_type = dmatype;
 
        if (dmatype == fasdma_real_all)
-               fas216_set_stc(info, info->SCpnt->request_bufflen);
+               fas216_set_stc(info, info->scsi.SCp.phase);
        else
                fas216_set_stc(info, info->scsi.SCp.this_residual);
 
@@ -2019,6 +2018,7 @@ static void fas216_rq_sns_done(FAS216_Info *info, struct scsi_cmnd *SCpnt,
         * the upper layers to process.  This would have been set
         * correctly by fas216_std_done.
         */
+       scsi_eh_restore_cmnd(SCpnt, &info->ses);
        SCpnt->scsi_done(SCpnt);
 }
 
@@ -2104,22 +2104,12 @@ request_sense:
        if (SCpnt->cmnd[0] == REQUEST_SENSE)
                goto done;
 
+       scsi_eh_prep_cmnd(SCpnt, &info->ses, NULL, 0, ~0);
        fas216_log_target(info, LOG_CONNECT, SCpnt->device->id,
                          "requesting sense");
-       memset(SCpnt->cmnd, 0, sizeof (SCpnt->cmnd));
-       SCpnt->cmnd[0] = REQUEST_SENSE;
-       SCpnt->cmnd[1] = SCpnt->device->lun << 5;
-       SCpnt->cmnd[4] = sizeof(SCpnt->sense_buffer);
-       SCpnt->cmd_len = COMMAND_SIZE(SCpnt->cmnd[0]);
-       SCpnt->SCp.buffer = NULL;
-       SCpnt->SCp.buffers_residual = 0;
-       SCpnt->SCp.ptr = (char *)SCpnt->sense_buffer;
-       SCpnt->SCp.this_residual = sizeof(SCpnt->sense_buffer);
+       init_SCp(SCpnt);
        SCpnt->SCp.Message = 0;
        SCpnt->SCp.Status = 0;
-       SCpnt->request_bufflen = sizeof(SCpnt->sense_buffer);
-       SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-       SCpnt->use_sg = 0;
        SCpnt->tag = 0;
        SCpnt->host_scribble = (void *)fas216_rq_sns_done;