diff options
author | Krzysztof Kozlowski <k.kozlowski@samsung.com> | 2016-08-03 16:46:00 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-04 08:50:07 -0400 |
commit | 00085f1efa387a8ce100e3734920f7639c80caa3 (patch) | |
tree | 41ff3d6e6884918b4fc4f1ae96a284098167c5b0 /include/xen | |
parent | 1605d2715ad2e67ddd0485a26e05ed670a4285ca (diff) |
dma-mapping: use unsigned long for dma_attrs
The dma-mapping core and the implementations do not change the DMA
attributes passed by pointer. Thus the pointer can point to const data.
However the attributes do not have to be a bitfield. Instead unsigned
long will do fine:
1. This is just simpler. Both in terms of reading the code and setting
attributes. Instead of initializing local attributes on the stack
and passing pointer to it to dma_set_attr(), just set the bits.
2. It brings safeness and checking for const correctness because the
attributes are passed by value.
Semantic patches for this change (at least most of them):
virtual patch
virtual context
@r@
identifier f, attrs;
@@
f(...,
- struct dma_attrs *attrs
+ unsigned long attrs
, ...)
{
...
}
@@
identifier r.f;
@@
f(...,
- NULL
+ 0
)
and
// Options: --all-includes
virtual patch
virtual context
@r@
identifier f, attrs;
type t;
@@
t f(..., struct dma_attrs *attrs);
@@
identifier r.f;
@@
f(...,
- NULL
+ 0
)
Link: http://lkml.kernel.org/r/1468399300-5399-2-git-send-email-k.kozlowski@samsung.com
Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Acked-by: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>
Acked-by: Mark Salter <msalter@redhat.com> [c6x]
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com> [cris]
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> [drm]
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Acked-by: Joerg Roedel <jroedel@suse.de> [iommu]
Acked-by: Fabien Dessenne <fabien.dessenne@st.com> [bdisp]
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com> [vb2-core]
Acked-by: David Vrabel <david.vrabel@citrix.com> [xen]
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> [xen swiotlb]
Acked-by: Joerg Roedel <jroedel@suse.de> [iommu]
Acked-by: Richard Kuo <rkuo@codeaurora.org> [hexagon]
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> [m68k]
Acked-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> [s390]
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Acked-by: Hans-Christian Noren Egtvedt <egtvedt@samfundet.no> [avr32]
Acked-by: Vineet Gupta <vgupta@synopsys.com> [arc]
Acked-by: Robin Murphy <robin.murphy@arm.com> [arm64 and dma-iommu]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/xen')
-rw-r--r-- | include/xen/swiotlb-xen.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index 8b2eb93ae8ba..7c35e279d1e3 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h | |||
@@ -9,30 +9,30 @@ extern int xen_swiotlb_init(int verbose, bool early); | |||
9 | extern void | 9 | extern void |
10 | *xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, | 10 | *xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size, |
11 | dma_addr_t *dma_handle, gfp_t flags, | 11 | dma_addr_t *dma_handle, gfp_t flags, |
12 | struct dma_attrs *attrs); | 12 | unsigned long attrs); |
13 | 13 | ||
14 | extern void | 14 | extern void |
15 | xen_swiotlb_free_coherent(struct device *hwdev, size_t size, | 15 | xen_swiotlb_free_coherent(struct device *hwdev, size_t size, |
16 | void *vaddr, dma_addr_t dma_handle, | 16 | void *vaddr, dma_addr_t dma_handle, |
17 | struct dma_attrs *attrs); | 17 | unsigned long attrs); |
18 | 18 | ||
19 | extern dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, | 19 | extern dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, |
20 | unsigned long offset, size_t size, | 20 | unsigned long offset, size_t size, |
21 | enum dma_data_direction dir, | 21 | enum dma_data_direction dir, |
22 | struct dma_attrs *attrs); | 22 | unsigned long attrs); |
23 | 23 | ||
24 | extern void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, | 24 | extern void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, |
25 | size_t size, enum dma_data_direction dir, | 25 | size_t size, enum dma_data_direction dir, |
26 | struct dma_attrs *attrs); | 26 | unsigned long attrs); |
27 | extern int | 27 | extern int |
28 | xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | 28 | xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, |
29 | int nelems, enum dma_data_direction dir, | 29 | int nelems, enum dma_data_direction dir, |
30 | struct dma_attrs *attrs); | 30 | unsigned long attrs); |
31 | 31 | ||
32 | extern void | 32 | extern void |
33 | xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | 33 | xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, |
34 | int nelems, enum dma_data_direction dir, | 34 | int nelems, enum dma_data_direction dir, |
35 | struct dma_attrs *attrs); | 35 | unsigned long attrs); |
36 | 36 | ||
37 | extern void | 37 | extern void |
38 | xen_swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr, | 38 | xen_swiotlb_sync_single_for_cpu(struct device *hwdev, dma_addr_t dev_addr, |