[SCSI] wd33c93: convert to accessors and !use_sg cleanup

 - convert to accessors and !use_sg cleanup

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c
index fdbb92d1f722..f286c37da7e0 100644
--- a/drivers/scsi/wd33c93.c
+++ b/drivers/scsi/wd33c93.c
@@ -407,16 +407,16 @@ wd33c93_queuecommand(struct scsi_cmnd *cmd,
  *  - SCp.phase records this command's SRCID_ER bit setting
  */
 
-        if (cmd->use_sg) {
-                cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
-                cmd->SCp.buffers_residual = cmd->use_sg - 1;
+        if (scsi_bufflen(cmd)) {
+                cmd->SCp.buffer = scsi_sglist(cmd);
+                cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
                 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
                 cmd->SCp.this_residual = cmd->SCp.buffer->length;
         } else {
                 cmd->SCp.buffer = NULL;
                 cmd->SCp.buffers_residual = 0;
-                cmd->SCp.ptr = (char *) cmd->request_buffer;
-                cmd->SCp.this_residual = cmd->request_bufflen;
+                cmd->SCp.ptr = NULL;
+                cmd->SCp.this_residual = 0;
         }
 
 /* WD docs state that at the conclusion of a "LEVEL2" command, the