github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

block, nvme: remove unused dma_iova_state function parameter

Browse Source 
DMA IOVA state is not used inside blk_rq_dma_map_iter_next, get
rid of the argument.

Signed-off-by: Nitesh Shetty <nj.shetty@samsung.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Nitesh Shetty 2026-01-12 20:08:08 +05:30 committed by Jens Axboe
parent 65955a0993
commit 91e1c1bcf0
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
block/blk-mq-dma.c
View File

@ -238,7 +238,6 @@ EXPORT_SYMBOL_GPL(blk_rq_dma_map_iter_start);
* blk_rq_dma_map_iter_next - map the next DMA segment for a request * blk_rq_dma_map_iter_next - map the next DMA segment for a request
* @req: request to map * @req: request to map
* @dma_dev: device to map to * @dma_dev: device to map to
* @state: DMA IOVA state
* @iter: block layer DMA iterator * @iter: block layer DMA iterator
* *
* Iterate to the next mapping after a previous call to * Iterate to the next mapping after a previous call to
@ -253,7 +252,7 @@ EXPORT_SYMBOL_GPL(blk_rq_dma_map_iter_start);
* returned in @iter.status. * returned in @iter.status.
*/ */
bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev, bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev,
struct dma_iova_state *state, struct blk_dma_iter *iter) struct blk_dma_iter *iter)
{ {
struct phys_vec vec; struct phys_vec vec;

5
drivers/nvme/host/pci.c
View File

@ -823,7 +823,7 @@ static bool nvme_pci_prp_iter_next(struct request *req, struct device *dma_dev,
if (iter->len) if (iter->len)
return true; return true;
if (!blk_rq_dma_map_iter_next(req, dma_dev, &iod->dma_state, iter)) if (!blk_rq_dma_map_iter_next(req, dma_dev, iter))
return false; return false;
if (!dma_use_iova(&iod->dma_state) && dma_need_unmap(dma_dev)) { if (!dma_use_iova(&iod->dma_state) && dma_need_unmap(dma_dev)) {
iod->dma_vecs[iod->nr_dma_vecs].addr = iter->addr; iod->dma_vecs[iod->nr_dma_vecs].addr = iter->addr;
@ -1010,8 +1010,7 @@ static blk_status_t nvme_pci_setup_data_sgl(struct request *req,
} }
nvme_pci_sgl_set_data(&sg_list[mapped++], iter); nvme_pci_sgl_set_data(&sg_list[mapped++], iter);
iod->total_len += iter->len; iod->total_len += iter->len;
} while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, &iod->dma_state, } while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, iter));
iter));
nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, mapped); nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, mapped);
if (unlikely(iter->status)) if (unlikely(iter->status))

2
include/linux/blk-mq-dma.h
View File

@ -28,7 +28,7 @@ struct blk_dma_iter {
bool blk_rq_dma_map_iter_start(struct request *req, struct device *dma_dev, bool blk_rq_dma_map_iter_start(struct request *req, struct device *dma_dev,
struct dma_iova_state *state, struct blk_dma_iter *iter); struct dma_iova_state *state, struct blk_dma_iter *iter);
bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev, bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev,
struct dma_iova_state *state, struct blk_dma_iter *iter); struct blk_dma_iter *iter);
/** /**
* blk_rq_dma_map_coalesce - were all segments coalesced? * blk_rq_dma_map_coalesce - were all segments coalesced?