skd: Use for_each_sg()

This change makes skd_preop_sg_list() support chained sg-lists.

Signed-off-by: Bart Van Assche <bart.vanassche@wdc.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/skd_main.c b/drivers/block/skd_main.c
index a363d5f6bcb5c82985733ae6449144e9e6ec3d50..62e06e35ddf55b54735529951424087f1c933bd7 100644 (file)
--- a/drivers/block/skd_main.c
+++ b/drivers/block/skd_main.c
@@ -740,7 +740,7 @@ static bool skd_preop_sg_list(struct skd_device *skdev,
                             struct skd_request_context *skreq)
 {
        struct request *req = skreq->req;
-       struct scatterlist *sg = &skreq->sg[0];
+       struct scatterlist *sgl = &skreq->sg[0], *sg;
        int n_sg;
        int i;
 
@@ -749,7 +749,7 @@ static bool skd_preop_sg_list(struct skd_device *skdev,
        WARN_ON_ONCE(skreq->data_dir != DMA_TO_DEVICE &&
                     skreq->data_dir != DMA_FROM_DEVICE);
 
-       n_sg = blk_rq_map_sg(skdev->queue, req, sg);
+       n_sg = blk_rq_map_sg(skdev->queue, req, sgl);
        if (n_sg <= 0)
                return false;
 
@@ -757,7 +757,7 @@ static bool skd_preop_sg_list(struct skd_device *skdev,
         * Map scatterlist to PCI bus addresses.
         * Note PCI might change the number of entries.
         */
-       n_sg = pci_map_sg(skdev->pdev, sg, n_sg, skreq->data_dir);
+       n_sg = pci_map_sg(skdev->pdev, sgl, n_sg, skreq->data_dir);
        if (n_sg <= 0)
                return false;
 
@@ -765,10 +765,10 @@ static bool skd_preop_sg_list(struct skd_device *skdev,
 
        skreq->n_sg = n_sg;
 
-       for (i = 0; i < n_sg; i++) {
+       for_each_sg(sgl, sg, n_sg, i) {
                struct fit_sg_descriptor *sgd = &skreq->sksg_list[i];
-               u32 cnt = sg_dma_len(&sg[i]);
-               uint64_t dma_addr = sg_dma_address(&sg[i]);
+               u32 cnt = sg_dma_len(sg);
+               uint64_t dma_addr = sg_dma_address(sg);
 
                sgd->control = FIT_SGD_CONTROL_NOT_LAST;
                sgd->byte_count = cnt;