Commit 22d48269 authored by Konrad Rzeszutek Wilk's avatar Konrad Rzeszutek Wilk

swiotlb: search and replace "int dir" with "enum dma_data_direction dir"

.. to catch anybody doing something funky.

See "swiotlb: swiotlb: add swiotlb_tbl_map_single library function" for
full description of patchset.

[v2: swiotlb_sync_single_range_* no more - removed usage]
[v3: enum dma_data_direction direction -> enum dma_data_direction dir]
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tested-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
parent bfc5501f
...@@ -43,11 +43,11 @@ extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, ...@@ -43,11 +43,11 @@ extern void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
extern int extern int
swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents, swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nents,
int direction); enum dma_data_direction dir);
extern void extern void
swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents, swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
int direction); enum dma_data_direction dir);
extern int extern int
swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems, swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
......
...@@ -374,7 +374,8 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size, ...@@ -374,7 +374,8 @@ static void swiotlb_bounce(phys_addr_t phys, char *dma_addr, size_t size,
} }
void *swiotlb_tbl_map_single(struct device *hwdev, dma_addr_t tbl_dma_addr, void *swiotlb_tbl_map_single(struct device *hwdev, dma_addr_t tbl_dma_addr,
phys_addr_t phys, size_t size, int dir) phys_addr_t phys, size_t size,
enum dma_data_direction dir)
{ {
unsigned long flags; unsigned long flags;
char *dma_addr; char *dma_addr;
...@@ -481,7 +482,8 @@ void *swiotlb_tbl_map_single(struct device *hwdev, dma_addr_t tbl_dma_addr, ...@@ -481,7 +482,8 @@ void *swiotlb_tbl_map_single(struct device *hwdev, dma_addr_t tbl_dma_addr,
*/ */
static void * static void *
map_single(struct device *hwdev, phys_addr_t phys, size_t size, int dir) map_single(struct device *hwdev, phys_addr_t phys, size_t size,
enum dma_data_direction dir)
{ {
dma_addr_t start_dma_addr = swiotlb_virt_to_bus(hwdev, io_tlb_start); dma_addr_t start_dma_addr = swiotlb_virt_to_bus(hwdev, io_tlb_start);
...@@ -493,7 +495,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size, int dir) ...@@ -493,7 +495,7 @@ map_single(struct device *hwdev, phys_addr_t phys, size_t size, int dir)
*/ */
static void static void
swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr, size_t size, swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr, size_t size,
int dir) enum dma_data_direction dir)
{ {
unsigned long flags; unsigned long flags;
int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT; int i, count, nslots = ALIGN(size, 1 << IO_TLB_SHIFT) >> IO_TLB_SHIFT;
...@@ -534,7 +536,7 @@ swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr, size_t size, ...@@ -534,7 +536,7 @@ swiotlb_tbl_unmap_single(struct device *hwdev, char *dma_addr, size_t size,
static void static void
swiotlb_tbl_sync_single(struct device *hwdev, char *dma_addr, size_t size, swiotlb_tbl_sync_single(struct device *hwdev, char *dma_addr, size_t size,
int dir, int target) enum dma_data_direction dir, int target)
{ {
int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT; int index = (dma_addr - io_tlb_start) >> IO_TLB_SHIFT;
phys_addr_t phys = io_tlb_orig_addr[index]; phys_addr_t phys = io_tlb_orig_addr[index];
...@@ -624,7 +626,8 @@ swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr, ...@@ -624,7 +626,8 @@ swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
EXPORT_SYMBOL(swiotlb_free_coherent); EXPORT_SYMBOL(swiotlb_free_coherent);
static void static void
swiotlb_full(struct device *dev, size_t size, int dir, int do_panic) swiotlb_full(struct device *dev, size_t size, enum dma_data_direction dir,
int do_panic)
{ {
/* /*
* Ran out of IOMMU space for this operation. This is very bad. * Ran out of IOMMU space for this operation. This is very bad.
...@@ -702,7 +705,7 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page); ...@@ -702,7 +705,7 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page);
* whatever the device wrote there. * whatever the device wrote there.
*/ */
static void unmap_single(struct device *hwdev, dma_addr_t dev_addr, static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
size_t size, int dir) size_t size, enum dma_data_direction dir)
{ {
phys_addr_t paddr = dma_to_phys(hwdev, dev_addr); phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
...@@ -745,7 +748,7 @@ EXPORT_SYMBOL_GPL(swiotlb_unmap_page); ...@@ -745,7 +748,7 @@ EXPORT_SYMBOL_GPL(swiotlb_unmap_page);
*/ */
static void static void
swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr, swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
size_t size, int dir, int target) size_t size, enum dma_data_direction dir, int target)
{ {
phys_addr_t paddr = dma_to_phys(hwdev, dev_addr); phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
...@@ -832,7 +835,7 @@ EXPORT_SYMBOL(swiotlb_map_sg_attrs); ...@@ -832,7 +835,7 @@ EXPORT_SYMBOL(swiotlb_map_sg_attrs);
int int
swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
int dir) enum dma_data_direction dir)
{ {
return swiotlb_map_sg_attrs(hwdev, sgl, nelems, dir, NULL); return swiotlb_map_sg_attrs(hwdev, sgl, nelems, dir, NULL);
} }
...@@ -859,7 +862,7 @@ EXPORT_SYMBOL(swiotlb_unmap_sg_attrs); ...@@ -859,7 +862,7 @@ EXPORT_SYMBOL(swiotlb_unmap_sg_attrs);
void void
swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
int dir) enum dma_data_direction dir)
{ {
return swiotlb_unmap_sg_attrs(hwdev, sgl, nelems, dir, NULL); return swiotlb_unmap_sg_attrs(hwdev, sgl, nelems, dir, NULL);
} }
...@@ -874,7 +877,7 @@ EXPORT_SYMBOL(swiotlb_unmap_sg); ...@@ -874,7 +877,7 @@ EXPORT_SYMBOL(swiotlb_unmap_sg);
*/ */
static void static void
swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl, swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sgl,
int nelems, int dir, int target) int nelems, enum dma_data_direction dir, int target)
{ {
struct scatterlist *sg; struct scatterlist *sg;
int i; int i;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment