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

Commit 70479b71 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-pci: tidy up nvme_map_data 



Remove two pointless local variables, remove ret assignment that is
never used, move the use_sgl initialization closer to where it is used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
parent 29791057

drivers/nvme/host/pci.c

+5 −12
Original line number Diff line number Diff line
@@ -840,10 +840,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, 
		struct nvme_command *cmnd)

{

	struct nvme_iod *iod = blk_mq_rq_to_pdu(req);

	struct request_queue *q = req->q;

	enum dma_data_direction dma_dir = rq_data_dir(req) ?

			DMA_TO_DEVICE : DMA_FROM_DEVICE;

	blk_status_t ret = BLK_STS_IOERR;

	blk_status_t ret = BLK_STS_RESOURCE;

	int nr_mapped;



	if (blk_rq_nr_phys_segments(req) == 1) {
@@ -865,25 +862,21 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, 
	iod->sg = mempool_alloc(dev->iod_mempool, GFP_ATOMIC);

	if (!iod->sg)

		return BLK_STS_RESOURCE;



	iod->use_sgl = nvme_pci_use_sgls(dev, req);



	sg_init_table(iod->sg, blk_rq_nr_phys_segments(req));

	iod->nents = blk_rq_map_sg(q, req, iod->sg);

	iod->nents = blk_rq_map_sg(req->q, req, iod->sg);

	if (!iod->nents)

		goto out;



	ret = BLK_STS_RESOURCE;



	if (is_pci_p2pdma_page(sg_page(iod->sg)))

		nr_mapped = pci_p2pdma_map_sg(dev->dev, iod->sg, iod->nents,

					  dma_dir);

					      rq_dma_dir(req));

	else

		nr_mapped = dma_map_sg_attrs(dev->dev, iod->sg, iod->nents,

					     dma_dir,  DMA_ATTR_NO_WARN);

					     rq_dma_dir(req), DMA_ATTR_NO_WARN);

	if (!nr_mapped)

		goto out;



	iod->use_sgl = nvme_pci_use_sgls(dev, req);

	if (iod->use_sgl)

		ret = nvme_pci_setup_sgls(dev, req, &cmnd->rw, nr_mapped);

	else