Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ee0ae927937ac8a30350cca1a7a75efafb13976e

Authored by Boaz Harrosh
Committed by James Bottomley
1 parent 8e31f1f4d9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

drivers/scsi/wd33c93.c
Diff comments   View file @ ee0ae92
... ... @@ -407,16 +407,16 @@
407 407 * - SCp.phase records this command's SRCID_ER bit setting
408 408 */
409 409  
410   - if (cmd->use_sg) {
411   - cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
412   - cmd->SCp.buffers_residual = cmd->use_sg - 1;
  410 + if (scsi_bufflen(cmd)) {
  411 + cmd->SCp.buffer = scsi_sglist(cmd);
  412 + cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
413 413 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
414 414 cmd->SCp.this_residual = cmd->SCp.buffer->length;
415 415 } else {
416 416 cmd->SCp.buffer = NULL;
417 417 cmd->SCp.buffers_residual = 0;
418   - cmd->SCp.ptr = (char *) cmd->request_buffer;
419   - cmd->SCp.this_residual = cmd->request_bufflen;
  418 + cmd->SCp.ptr = NULL;
  419 + cmd->SCp.this_residual = 0;
420 420 }
421 421  
422 422 /* WD docs state that at the conclusion of a "LEVEL2" command, the