| Message ID | 1442581036-23789-5-git-send-email-clabbe.montjoie@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Herbert Xu |
| Headers | show |
Thanks, looks good. I've added it to my queue for sending zfcp patches upstream next time (might take a while). On 09/18/2015 02:57 PM, LABBE Corentin wrote: > The zfcp_qdio_sbale_count function do the same work than sg_nents(). > So replace it by sg_nents() for removing duplicate code. > > Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> > --- > drivers/s390/scsi/zfcp_fsf.c | 3 +-- > drivers/s390/scsi/zfcp_qdio.h | 15 --------------- > 2 files changed, 1 insertion(+), 17 deletions(-) > > diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c > index 522a633..edc137a 100644 > --- a/drivers/s390/scsi/zfcp_fsf.c > +++ b/drivers/s390/scsi/zfcp_fsf.c > @@ -985,8 +985,7 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req, > if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_resp)) > return -EIO; > > - zfcp_qdio_set_data_div(qdio, &req->qdio_req, > - zfcp_qdio_sbale_count(sg_req)); > + zfcp_qdio_set_data_div(qdio, &req->qdio_req, sg_nents(sg_req)); > zfcp_qdio_set_sbale_last(qdio, &req->qdio_req); > zfcp_qdio_set_scount(qdio, &req->qdio_req); > return 0; > diff --git a/drivers/s390/scsi/zfcp_qdio.h b/drivers/s390/scsi/zfcp_qdio.h > index 497cd37..85cdb82 100644 > --- a/drivers/s390/scsi/zfcp_qdio.h > +++ b/drivers/s390/scsi/zfcp_qdio.h > @@ -225,21 +225,6 @@ void zfcp_qdio_set_data_div(struct zfcp_qdio *qdio, > } > > /** > - * zfcp_qdio_sbale_count - count sbale used > - * @sg: pointer to struct scatterlist > - */ > -static inline > -unsigned int zfcp_qdio_sbale_count(struct scatterlist *sg) > -{ > - unsigned int count = 0; > - > - for (; sg; sg = sg_next(sg)) > - count++; > - > - return count; > -} > - > -/** > * zfcp_qdio_real_bytes - count bytes used > * @sg: pointer to struct scatterlist > */ >
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 522a633..edc137a 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c @@ -985,8 +985,7 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req, if (zfcp_qdio_sbals_from_sg(qdio, &req->qdio_req, sg_resp)) return -EIO; - zfcp_qdio_set_data_div(qdio, &req->qdio_req, - zfcp_qdio_sbale_count(sg_req)); + zfcp_qdio_set_data_div(qdio, &req->qdio_req, sg_nents(sg_req)); zfcp_qdio_set_sbale_last(qdio, &req->qdio_req); zfcp_qdio_set_scount(qdio, &req->qdio_req); return 0; diff --git a/drivers/s390/scsi/zfcp_qdio.h b/drivers/s390/scsi/zfcp_qdio.h index 497cd37..85cdb82 100644 --- a/drivers/s390/scsi/zfcp_qdio.h +++ b/drivers/s390/scsi/zfcp_qdio.h @@ -225,21 +225,6 @@ void zfcp_qdio_set_data_div(struct zfcp_qdio *qdio, } /** - * zfcp_qdio_sbale_count - count sbale used - * @sg: pointer to struct scatterlist - */ -static inline -unsigned int zfcp_qdio_sbale_count(struct scatterlist *sg) -{ - unsigned int count = 0; - - for (; sg; sg = sg_next(sg)) - count++; - - return count; -} - -/** * zfcp_qdio_real_bytes - count bytes used * @sg: pointer to struct scatterlist */
The zfcp_qdio_sbale_count function do the same work than sg_nents(). So replace it by sg_nents() for removing duplicate code. Signed-off-by: LABBE Corentin <clabbe.montjoie@gmail.com> --- drivers/s390/scsi/zfcp_fsf.c | 3 +-- drivers/s390/scsi/zfcp_qdio.h | 15 --------------- 2 files changed, 1 insertion(+), 17 deletions(-)