Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7d91869c authored by LABBE Corentin's avatar LABBE Corentin Committed by Martin K. Petersen
Browse files

scsi: zfcp: replace zfcp_qdio_sbale_count by sg_nents 



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: default avatarLABBE Corentin <clabbe.montjoie@gmail.com>
Signed-off-by: default avatarSteffen Maier <maier@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Block <bblock@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4737c5a0

drivers/s390/scsi/zfcp_fsf.c

+1 −2
Original line number Diff line number Diff line
@@ -991,8 +991,7 @@ static int zfcp_fsf_setup_ct_els_sbals(struct zfcp_fsf_req *req, 
		qtcb->bottom.support.resp_buf_length =

			zfcp_qdio_real_bytes(sg_resp);



		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;

drivers/s390/scsi/zfcp_qdio.h

+0 −15
Original line number Diff line number Diff line
@@ -224,21 +224,6 @@ void zfcp_qdio_set_data_div(struct zfcp_qdio *qdio, 
	sbale->length = count;

}



/**

 * 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