diff options
author | EunBong Song <eunb.song@samsung.com> | 2013-08-05 12:30:47 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2013-08-09 11:28:42 -0400 |
commit | 4d86ec7a8a3f9c135fdc34d7aed2a9467e2e6ff9 (patch) | |
tree | dc3ef06a9a68b8ff2f70c10327528798ff9a4b78 /lib/swiotlb.c | |
parent | cd9151e26d31048b2b5e00fd02e110e07d2200c9 (diff) |
swiotlb: replace dma_length with sg_dma_len() macro
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>
Diffstat (limited to 'lib/swiotlb.c')
-rw-r--r-- | lib/swiotlb.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index d23762e6652c..4e8686c7e5a4 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -870,13 +870,13 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, | |||
870 | swiotlb_full(hwdev, sg->length, dir, 0); | 870 | swiotlb_full(hwdev, sg->length, dir, 0); |
871 | swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, | 871 | swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, |
872 | attrs); | 872 | attrs); |
873 | sgl[0].dma_length = 0; | 873 | sg_dma_len(sgl) = 0; |
874 | return 0; | 874 | return 0; |
875 | } | 875 | } |
876 | sg->dma_address = phys_to_dma(hwdev, map); | 876 | sg->dma_address = phys_to_dma(hwdev, map); |
877 | } else | 877 | } else |
878 | sg->dma_address = dev_addr; | 878 | sg->dma_address = dev_addr; |
879 | sg->dma_length = sg->length; | 879 | sg_dma_len(sg) = sg->length; |
880 | } | 880 | } |
881 | return nelems; | 881 | return nelems; |
882 | } | 882 | } |
@@ -904,7 +904,7 @@ swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | |||
904 | BUG_ON(dir == DMA_NONE); | 904 | BUG_ON(dir == DMA_NONE); |
905 | 905 | ||
906 | for_each_sg(sgl, sg, nelems, i) | 906 | for_each_sg(sgl, sg, nelems, i) |
907 | unmap_single(hwdev, sg->dma_address, sg->dma_length, dir); | 907 | unmap_single(hwdev, sg->dma_address, sg_dma_len(sg), dir); |
908 | 908 | ||
909 | } | 909 | } |
910 | EXPORT_SYMBOL(swiotlb_unmap_sg_attrs); | 910 | EXPORT_SYMBOL(swiotlb_unmap_sg_attrs); |
@@ -934,7 +934,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl, | |||
934 | 934 | ||
935 | for_each_sg(sgl, sg, nelems, i) | 935 | for_each_sg(sgl, sg, nelems, i) |
936 | swiotlb_sync_single(hwdev, sg->dma_address, | 936 | swiotlb_sync_single(hwdev, sg->dma_address, |
937 | sg->dma_length, dir, target); | 937 | sg_dma_len(sg), dir, target); |
938 | } | 938 | } |
939 | 939 | ||
940 | void | 940 | void |