Merge tag 'for-linus' of https://github.com/openrisc/linux

[linux-2.6-microblaze.git] / drivers / scsi / dc395x.c

diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c
index 9b8796c..67a8971 100644 (file)
--- a/drivers/scsi/dc395x.c
+++ b/drivers/scsi/dc395x.c
@@ -946,7 +946,6 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,
  * layer, invoke 'done' on completion
  *
  * @cmd: pointer to scsi command object
- * @done: function pointer to be invoked on completion
  *
  * Returns 1 if the adapter (host) is busy, else returns 0. One
  * reason for an adapter to be busy is that the number
@@ -959,7 +958,7 @@ static void build_srb(struct scsi_cmnd *cmd, struct DeviceCtlBlk *dcb,
  * Locks: struct Scsi_Host::host_lock held on entry (with "irqsave")
  *        and is expected to be held on return.
  *
- **/
+ */
 static int dc395x_queue_command_lck(struct scsi_cmnd *cmd)
 {
        void (*done)(struct scsi_cmnd *) = scsi_done;
@@ -3315,9 +3314,6 @@ static void srb_done(struct AdapterCtlBlk *acb, struct DeviceCtlBlk *dcb,
 
        /* Here is the info for Doug Gilbert's sg3 ... */
        scsi_set_resid(cmd, srb->total_xfer_length);
-       /* This may be interpreted by sb. or not ... */
-       cmd->SCp.this_residual = srb->total_xfer_length;
-       cmd->SCp.buffers_residual = 0;
        if (debug_enabled(DBG_KG)) {
                if (srb->total_xfer_length)
                        dprintkdbg(DBG_KG, "srb_done: (0x%p) <%02i-%i> "