Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

swiotlb: replace dma_length with sg_dma_len() macro

Browse source 
This patch replace dma_length in "lib/swiotlb.c" to sg_dma_len() macro,
because the build error can occur if CONFIG_NEED_SG_DMA_LENGTH is not
set, and CONFIG_SWIOTLB is set.

Singed-off-by: EunBong Song <eunb.song@samsung.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
EunBong Song 2013-08-05 17:30:47 +01:00 committed by Konrad Rzeszutek Wilk
parent cd9151e26d
commit 4d86ec7a8a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/swiotlb.c
View file

@ -870,13 +870,13 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
swiotlb_full(hwdev, sg->length, dir, 0); swiotlb_full(hwdev, sg->length, dir, 0);
swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
attrs); attrs);
sgl[0].dma_length = 0; sg_dma_len(sgl) = 0;
return 0; return 0;
} }
sg->dma_address = phys_to_dma(hwdev, map); sg->dma_address = phys_to_dma(hwdev, map);
} else } else
sg->dma_address = dev_addr; sg->dma_address = dev_addr;
sg->dma_length = sg->length; sg_dma_len(sg) = sg->length;
} }
return nelems; return nelems;
} }
@ -904,7 +904,7 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
BUG_ON(dir == DMA_NONE); BUG_ON(dir == DMA_NONE);
for_each_sg(sgl, sg, nelems, i) for_each_sg(sgl, sg, nelems, i)
unmap_single(hwdev, sg->dma_address, sg->dma_length, dir); unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir);
} }
EXPORT_SYMBOL(swiotlb_unmap_sg_attrs); EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
@ -934,7 +934,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
for_each_sg(sgl, sg, nelems, i) for_each_sg(sgl, sg, nelems, i)
swiotlb_sync_single(hwdev, sg->dma_address, swiotlb_sync_single(hwdev, sg->dma_address,
sg->dma_length, dir, target); sg_dma_len(sg), dir, target);
} }
void void