linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Boaz Harrosh <bharrosh@panasas.com>
To: James Bottomley <James.Bottomley@SteelEye.com>,
	FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	Alan Stern <stern@rowland.harvard.edu>,
	Matthew
Subject: [PATCH 17/24] in2000.c: convert to accessors and !use_sg cleanup
Date: Wed, 12 Sep 2007 03:06:26 +0300	[thread overview]
Message-ID: <46E72D82.6020101@panasas.com> (raw)
In-Reply-To: <46E6F92D.2090409@panasas.com>


 - convert to accessors and !use_sg cleanup

Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
---
 drivers/scsi/in2000.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/in2000.c b/drivers/scsi/in2000.c
index 312190a..31e841c 100644
--- a/drivers/scsi/in2000.c
+++ b/drivers/scsi/in2000.c
@@ -369,16 +369,16 @@ static int in2000_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
  *  - 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 = (char *) page_address(cmd->SCp.buffer->page) + cmd->SCp.buffer->offset;
 		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;
 	}
 	cmd->SCp.have_data_in = 0;
 
-- 
1.5.3.1



  parent reply	other threads:[~2007-09-12  0:10 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-09-11 20:23 [patchset 0/24] Lots of the Accessors patches and !use_sg cleanup Boaz Harrosh
2007-09-11 20:50 ` Cameron, Steve
2007-09-11 21:05   ` Boaz Harrosh
2007-09-11 23:49 ` [PATCH 01/24] usb: transport - convert to accessors and !use_sg code path removal Boaz Harrosh
2007-09-11 23:50 ` [PATCH 02/24] usb: protocol.c " Boaz Harrosh
2007-09-11 23:51 ` [PATCH 03/24] usb: shuttle_usbat.c " Boaz Harrosh
2007-09-11 23:51 ` [PATCH 04/24] usb: freecom.c & sddr09.c - convert to accessors and !use_sg cleanup Boaz Harrosh
2007-09-11 23:53 ` [PATCH 05/24] isd200.c: use one-element sg list in issuing commands Boaz Harrosh
2007-09-11 23:54 ` [PATCH 06/24] NCR5380 familly convert to accessors & !use_sg cleanup Boaz Harrosh
2007-09-11 23:55 ` [PATCH 07/24] arm: scsi convert to accessors and " Boaz Harrosh
2007-09-12  7:42   ` Russell King
2007-09-18 15:04     ` Boaz Harrosh
2007-12-15  0:27       ` James Bottomley
2007-12-16 15:28         ` Boaz Harrosh
2008-02-01 20:10           ` Russell King
2008-01-31 18:09     ` James Bottomley
2007-09-11 23:56 ` [PATCH 08/24] nsp_cs.c convert to data " Boaz Harrosh
2007-09-11 23:58 ` [PATCH 09/24] libata-scsi: convert to use the data buffer accessors Boaz Harrosh
2007-09-12  0:09   ` Jeff Garzik
2007-09-12  0:25     ` Boaz Harrosh
2007-09-12  1:40     ` Matthew Dharm
2007-09-12  6:36       ` Boaz Harrosh
2007-09-18 15:46     ` [PATCH ver2 1/2] libata-scsi: Remove !use_sg code paths Boaz Harrosh
2007-09-20 21:12       ` Jeff Garzik
2007-09-18 15:48     ` [PATCH ver2 2/2] libata-scsi: convert to use the data buffer accessors Boaz Harrosh
2007-09-12  0:00 ` [PATCH 10/24] eata_pio.c: convert to accessors and !use_sg cleanup Boaz Harrosh
2007-09-12  0:00 ` [PATCH 11/24] a2091.c: " Boaz Harrosh
2007-09-12  0:01 ` [PATCH 12/24] a3000.c: " Boaz Harrosh
2007-09-12  0:02 ` [PATCH 13/24] aha1542.c: " Boaz Harrosh
2007-09-12  0:03 ` [PATCH 14/24] atp870u.c: " Boaz Harrosh
2007-09-12  0:04 ` [PATCH 15/24] fd_mcs.c: " Boaz Harrosh
2007-09-12  0:05 ` [PATCH 16/24] imm.c: " Boaz Harrosh
2007-09-12  0:06 ` Boaz Harrosh [this message]
2007-09-12  0:07 ` [PATCH 18/24] ppa.c: " Boaz Harrosh
2007-09-12  0:07 ` [PATCH 19/24] wd33c93.c: " Boaz Harrosh
2007-09-12  0:09 ` Subject: [PATCH 20/24] scsi: esp family " Boaz Harrosh
2007-09-12  0:09 ` [PATCH 21/24] qlogicpti.c: " Boaz Harrosh
2007-10-10 18:25   ` [PATCH 21/24 ver2] " Boaz Harrosh
2007-10-10 22:58     ` David Miller
2007-09-12  0:10 ` Subject: [PATCH 22/24] Remove psi240i driver from kernel Boaz Harrosh
2007-09-12  0:11 ` [PATCH 23/24] wd7000.c - proper fix for boards without sg support Boaz Harrosh
2007-09-12  0:13 ` [PATCH 24/24] ide-scsi.c: convert to data accessors and !use_sg cleanup Boaz Harrosh
2007-09-17 11:04   ` Bartlomiej Zolnierkiewicz
2007-09-18  8:49     ` Boaz Harrosh
2007-09-18  9:03   ` [PATCH ver2 " Boaz Harrosh
2007-09-18  9:14     ` Christoph Hellwig
2007-09-18 10:24       ` Boaz Harrosh
2007-09-18 10:27   ` [PATCH 24/24 ver3 ] " Boaz Harrosh
2007-09-19 19:59     ` Bartlomiej Zolnierkiewicz
2007-09-12 16:00 ` [patchset 0/24] Lots of the Accessors patches " Maciej W. Rozycki
2007-09-17 10:46 ` Bartlomiej Zolnierkiewicz
2007-09-17 11:36   ` Boaz Harrosh
2007-09-17 13:51   ` James Bottomley
2007-09-17 20:05     ` Bartlomiej Zolnierkiewicz
2007-09-17 20:57       ` Jeff Garzik
2007-09-17 21:00         ` James Bottomley
2007-09-17 21:05           ` Jeff Garzik
2007-10-10 18:24 ` Boaz Harrosh
2007-10-10 19:14   ` Matthew Wilcox

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=46E72D82.6020101@panasas.com \
    --to=bharrosh@panasas.com \
    --cc=James.Bottomley@SteelEye.com \
    --cc=fujita.tomonori@lab.ntt.co.jp \
    --cc=gregkh@suse.de \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).