[SCSI] eata_pio: convert to accessors and !use_sg cleanup
authorBoaz Harrosh <bharrosh@panasas.com>
Sun, 9 Sep 2007 18:10:27 +0000 (21:10 +0300)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Sat, 12 Jan 2008 00:22:34 +0000 (18:22 -0600)
 - convert to accessors and !use_sg cleanup

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
drivers/scsi/eata_pio.c

index 982c5092be11fa055952f0f0d0f68c3758741a09..9579507f555bd46b582063ed63509682c1be41c2 100644 (file)
@@ -385,7 +385,7 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
                cp->DataIn = 0; /* Input mode  */
 
        cp->Interpret = (cmd->device->id == hd->hostid);
-       cp->cp_datalen = cpu_to_be32(cmd->request_bufflen);
+       cp->cp_datalen = cpu_to_be32(scsi_bufflen(cmd));
        cp->Auto_Req_Sen = 0;
        cp->cp_reqDMA = 0;
        cp->reqlen = 0;
@@ -402,14 +402,14 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
        cp->cmd = cmd;
        cmd->host_scribble = (char *) &hd->ccb[y];
 
-       if (cmd->use_sg == 0) {
+       if (!scsi_bufflen(cmd)) {
                cmd->SCp.buffers_residual = 1;
-               cmd->SCp.ptr = cmd->request_buffer;
-               cmd->SCp.this_residual = cmd->request_bufflen;
+               cmd->SCp.ptr = NULL;
+               cmd->SCp.this_residual = 0;
                cmd->SCp.buffer = NULL;
        } else {
-               cmd->SCp.buffer = cmd->request_buffer;
-               cmd->SCp.buffers_residual = cmd->use_sg;
+               cmd->SCp.buffer = scsi_sglist(cmd);
+               cmd->SCp.buffers_residual = scsi_sg_count(cmd);
                cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
                cmd->SCp.this_residual = cmd->SCp.buffer->length;
        }