diff options
author | Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com> | 2018-10-17 14:34:15 -0400 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2018-10-18 03:31:43 -0400 |
commit | 3045c0d05e728134aefb8adbbc56a4d876a0bdce (patch) | |
tree | 14fdb9675e6e17396d53c448aabea6f15264c1b9 /drivers/nvme | |
parent | cb4bfda62afa25b4eee3d635d33fccdd9485dd7c (diff) |
nvme-pci: remove duplicate check
This is a cleanup patch doesn't change any functionality. It removes
the duplicate call to the blk_integrity_rq() in the nvme_map_data().
Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Reviewed-by: Keith Busch <keith.busch@intel.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/host/pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index 72737009b82d..4e023cd007e1 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c | |||
@@ -772,10 +772,10 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req, | |||
772 | 772 | ||
773 | if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir)) | 773 | if (!dma_map_sg(dev->dev, &iod->meta_sg, 1, dma_dir)) |
774 | goto out_unmap; | 774 | goto out_unmap; |
775 | } | ||
776 | 775 | ||
777 | if (blk_integrity_rq(req)) | ||
778 | cmnd->rw.metadata = cpu_to_le64(sg_dma_address(&iod->meta_sg)); | 776 | cmnd->rw.metadata = cpu_to_le64(sg_dma_address(&iod->meta_sg)); |
777 | } | ||
778 | |||
779 | return BLK_STS_OK; | 779 | return BLK_STS_OK; |
780 | 780 | ||
781 | out_unmap: | 781 | out_unmap: |