[PATCH v8 09/15] swiotlb: Move alloc_size to find_slots

[Claire Chang <tientzu@xxxxxxxxxxxx>]

Move the maintenance of alloc_size to find_slots for better code
reusability later.

Signed-off-by: Claire Chang <tientzu@xxxxxxxxxxxx>
---
 kernel/dma/swiotlb.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index fa7f23fffc81..88b3471ac6a8 100644
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -482,8 +482,11 @@ static int find_slots(struct device *dev, phys_addr_t 
orig_addr,
        return -1;
 
 found:
-       for (i = index; i < index + nslots; i++)
+       for (i = index; i < index + nslots; i++) {
                mem->slots[i].list = 0;
+               mem->slots[i].alloc_size =
+                       alloc_size - ((i - index) << IO_TLB_SHIFT);
+       }
        for (i = index - 1;
             io_tlb_offset(i) != IO_TLB_SEGSIZE - 1 &&
             mem->slots[i].list; i--)
@@ -538,11 +541,8 @@ phys_addr_t swiotlb_tbl_map_single(struct device *dev, 
phys_addr_t orig_addr,
         * This is needed when we sync the memory.  Then we sync the buffer if
         * needed.
         */
-       for (i = 0; i < nr_slots(alloc_size + offset); i++) {
+       for (i = 0; i < nr_slots(alloc_size + offset); i++)
                mem->slots[index + i].orig_addr = slot_addr(orig_addr, i);
-               mem->slots[index + i].alloc_size =
-                       alloc_size - (i << IO_TLB_SHIFT);
-       }
        tlb_addr = slot_addr(mem->start, index) + offset;
        if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC) &&
            (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL))
-- 
2.31.1.818.g46aad6cb9e-goog