From: Finn Thain <fthain@telegraphics.com.au>
To: Ming Lei <ming.lei@redhat.com>
Cc: linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
James Bottomley <James.Bottomley@HansenPartnership.com>,
Bart Van Assche <bvanassche@acm.org>,
Hannes Reinecke <hare@suse.com>, Christoph Hellwig <hch@lst.de>,
Jim Gill <jgill@vmware.com>, Cathy Avery <cavery@redhat.com>,
"Ewan D . Milne" <emilne@redhat.com>,
Brian King <brking@us.ibm.com>,
James Smart <james.smart@broadcom.com>,
"Juergen E . Fischer" <fischer@norbit.de>,
Michael Schmitz <schmitzmic@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
devel@driverdev.osuosl.org, linux-usb@vger.kernel.org,
Dan Carpenter <dan.carpenter@oracle.com>,
Benjamin Block <bblock@linux.ibm.com>,
Oliver Neukum <oliver@neukum.org>
Subject: Re: [PATCH V3 07/15] usb: image: microtek: use sg helper to operate scatterlist
Date: Fri, 14 Jun 2019 15:39:10 +1000 (AEST) [thread overview]
Message-ID: <alpine.LNX.2.21.1906141536000.33@nippy.intranet> (raw)
In-Reply-To: <20190614025316.7360-8-ming.lei@redhat.com>
On Fri, 14 Jun 2019, Ming Lei wrote:
> Use the scatterlist iterators and remove direct indexing of the
> scatterlist array.
>
> This way allows us to pre-allocate one small scatterlist, which can be
> chained with one runtime allocated scatterlist if the pre-allocated one
> isn't enough for the whole request.
>
> Cc: Oliver Neukum <oliver@neukum.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: linux-usb@vger.kernel.org
> Signed-off-by: Ming Lei <ming.lei@redhat.com>
> ---
> drivers/usb/image/microtek.c | 20 ++++++++------------
> drivers/usb/image/microtek.h | 2 +-
> 2 files changed, 9 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/usb/image/microtek.c b/drivers/usb/image/microtek.c
> index 607be1f4fe27..0a57c2cc8e5a 100644
> --- a/drivers/usb/image/microtek.c
> +++ b/drivers/usb/image/microtek.c
> @@ -488,7 +488,6 @@ static void mts_command_done( struct urb *transfer )
>
> static void mts_do_sg (struct urb* transfer)
> {
> - struct scatterlist * sg;
> int status = transfer->status;
> MTS_INT_INIT();
>
> @@ -500,13 +499,12 @@ static void mts_do_sg (struct urb* transfer)
> mts_transfer_cleanup(transfer);
> }
>
> - sg = scsi_sglist(context->srb);
> - context->fragment++;
> + context->curr_sg = sg_next(context->curr_sg);
> mts_int_submit_urb(transfer,
> context->data_pipe,
> - sg_virt(&sg[context->fragment]),
> - sg[context->fragment].length,
> - context->fragment + 1 == scsi_sg_count(context->srb) ?
> + sg_virt(context->curr_sg),
> + context->curr_sg->length,
> + sg_is_last(context->curr_sg) ?
> mts_data_done : mts_do_sg);
> }
>
> @@ -526,22 +524,20 @@ static void
> mts_build_transfer_context(struct scsi_cmnd *srb, struct mts_desc* desc)
> {
> int pipe;
> - struct scatterlist * sg;
> -
> +
> MTS_DEBUG_GOT_HERE();
>
> desc->context.instance = desc;
> desc->context.srb = srb;
> - desc->context.fragment = 0;
>
> if (!scsi_bufflen(srb)) {
> desc->context.data = NULL;
> desc->context.data_length = 0;
> return;
> } else {
> - sg = scsi_sglist(srb);
> - desc->context.data = sg_virt(&sg[0]);
> - desc->context.data_length = sg[0].length;
> + desc->context.curr_sg = scsi_sglist(srb);
> + desc->context.data = sg_virt(desc->context.curr_sg);
> + desc->context.data_length = desc->context.curr_sg->length;
> }
>
Would it not be better to initialize desc->context.curr_sg in both
branches of this conditional?
--
>
> diff --git a/drivers/usb/image/microtek.h b/drivers/usb/image/microtek.h
> index 66685e59241a..7bd5f4639c4a 100644
> --- a/drivers/usb/image/microtek.h
> +++ b/drivers/usb/image/microtek.h
> @@ -21,7 +21,7 @@ struct mts_transfer_context
> void *data;
> unsigned data_length;
> int data_pipe;
> - int fragment;
> + struct scatterlist *curr_sg;
>
> u8 *scsi_status; /* status returned from ep_response after command completion */
> };
>
next prev parent reply other threads:[~2019-06-14 5:39 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-14 2:53 [PATCH V3 00/15] use sg helper to operate scatterlist Ming Lei
2019-06-14 2:53 ` [PATCH V3 01/15] scsi: vmw_pscsi: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 02/15] scsi: advansys: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 03/15] scsi: lpfc: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 04/15] scsi: mvumi: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 05/15] scsi: ipr: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 06/15] scsi: pmcraid: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 07/15] usb: image: microtek: " Ming Lei
2019-06-14 5:39 ` Finn Thain [this message]
2019-06-14 6:57 ` Ming Lei
2019-06-14 2:53 ` [PATCH V3 08/15] staging: unisys: visorhba: " Ming Lei
2019-06-14 5:48 ` Greg Kroah-Hartman
2019-06-14 2:53 ` [PATCH V3 09/15] s390: zfcp_fc: " Ming Lei
2019-06-16 16:25 ` Benjamin Block
2019-06-14 2:53 ` [PATCH V3 10/15] scsi: aha152x: " Ming Lei
2019-06-14 5:27 ` Finn Thain
2019-06-14 8:17 ` Ming Lei
2019-06-14 10:36 ` Finn Thain
2019-06-17 1:14 ` Ming Lei
2019-06-14 2:53 ` [PATCH V3 11/15] scsi: imm: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 12/15] scsi: pcmcia: nsp_cs: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 13/15] scsi: ppa: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 14/15] scsi: wd33c93: " Ming Lei
2019-06-14 2:53 ` [PATCH V3 15/15] NCR5380: Support chained sg lists Ming Lei
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=alpine.LNX.2.21.1906141536000.33@nippy.intranet \
--to=fthain@telegraphics.com.au \
--cc=James.Bottomley@HansenPartnership.com \
--cc=bblock@linux.ibm.com \
--cc=brking@us.ibm.com \
--cc=bvanassche@acm.org \
--cc=cavery@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=emilne@redhat.com \
--cc=fischer@norbit.de \
--cc=gregkh@linuxfoundation.org \
--cc=hare@suse.com \
--cc=hch@lst.de \
--cc=james.smart@broadcom.com \
--cc=jgill@vmware.com \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=ming.lei@redhat.com \
--cc=oliver@neukum.org \
--cc=schmitzmic@gmail.com \
/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).