Skip to content

Commit 91e1c1b

Browse files
nj-shettyaxboe
authored andcommitted
block, nvme: remove unused dma_iova_state function parameter
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>
1 parent 65955a0 commit 91e1c1b

3 files changed

Lines changed: 4 additions & 6 deletions

File tree

block/blk-mq-dma.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ EXPORT_SYMBOL_GPL(blk_rq_dma_map_iter_start);
238238
* blk_rq_dma_map_iter_next - map the next DMA segment for a request
239239
* @req: request to map
240240
* @dma_dev: device to map to
241-
* @state: DMA IOVA state
242241
* @iter: block layer DMA iterator
243242
*
244243
* Iterate to the next mapping after a previous call to
@@ -253,7 +252,7 @@ EXPORT_SYMBOL_GPL(blk_rq_dma_map_iter_start);
253252
* returned in @iter.status.
254253
*/
255254
bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev,
256-
struct dma_iova_state *state, struct blk_dma_iter *iter)
255+
struct blk_dma_iter *iter)
257256
{
258257
struct phys_vec vec;
259258

drivers/nvme/host/pci.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ static bool nvme_pci_prp_iter_next(struct request *req, struct device *dma_dev,
823823

824824
if (iter->len)
825825
return true;
826-
if (!blk_rq_dma_map_iter_next(req, dma_dev, &iod->dma_state, iter))
826+
if (!blk_rq_dma_map_iter_next(req, dma_dev, iter))
827827
return false;
828828
if (!dma_use_iova(&iod->dma_state) && dma_need_unmap(dma_dev)) {
829829
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,
10101010
}
10111011
nvme_pci_sgl_set_data(&sg_list[mapped++], iter);
10121012
iod->total_len += iter->len;
1013-
} while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, &iod->dma_state,
1014-
iter));
1013+
} while (blk_rq_dma_map_iter_next(req, nvmeq->dev->dev, iter));
10151014

10161015
nvme_pci_sgl_set_seg(&iod->cmd.common.dptr.sgl, sgl_dma, mapped);
10171016
if (unlikely(iter->status))

include/linux/blk-mq-dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct blk_dma_iter {
2828
bool blk_rq_dma_map_iter_start(struct request *req, struct device *dma_dev,
2929
struct dma_iova_state *state, struct blk_dma_iter *iter);
3030
bool blk_rq_dma_map_iter_next(struct request *req, struct device *dma_dev,
31-
struct dma_iova_state *state, struct blk_dma_iter *iter);
31+
struct blk_dma_iter *iter);
3232

3333
/**
3434
* blk_rq_dma_map_coalesce - were all segments coalesced?

0 commit comments

Comments
 (0)