diff options
author | Christoph Hellwig <hch@lst.de> | 2019-04-11 03:19:57 -0400 |
---|---|---|
committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2019-05-02 19:50:35 -0400 |
commit | aca351cc4c034b4880f0a0dc3602ed3761ef6f01 (patch) | |
tree | ea88ca29a3a8dac185e50dfcb0777879fb75af13 | |
parent | 53b29c336830db48ad3dc737f88b8c065b1f0851 (diff) |
swiotlb-xen: make instances match their method names
Just drop two pointless _attrs prefixes to make the code a little
more grep-able.
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r-- | drivers/xen/swiotlb-xen.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index bb7888429be6..272e4aef2a86 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c | |||
@@ -501,9 +501,8 @@ xen_swiotlb_sync_single_for_device(struct device *hwdev, dma_addr_t dev_addr, | |||
501 | * concerning calls here are the same as for swiotlb_unmap_page() above. | 501 | * concerning calls here are the same as for swiotlb_unmap_page() above. |
502 | */ | 502 | */ |
503 | static void | 503 | static void |
504 | xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | 504 | xen_swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, |
505 | int nelems, enum dma_data_direction dir, | 505 | enum dma_data_direction dir, unsigned long attrs) |
506 | unsigned long attrs) | ||
507 | { | 506 | { |
508 | struct scatterlist *sg; | 507 | struct scatterlist *sg; |
509 | int i; | 508 | int i; |
@@ -532,9 +531,8 @@ xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | |||
532 | * same here. | 531 | * same here. |
533 | */ | 532 | */ |
534 | static int | 533 | static int |
535 | xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | 534 | xen_swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems, |
536 | int nelems, enum dma_data_direction dir, | 535 | enum dma_data_direction dir, unsigned long attrs) |
537 | unsigned long attrs) | ||
538 | { | 536 | { |
539 | struct scatterlist *sg; | 537 | struct scatterlist *sg; |
540 | int i; | 538 | int i; |
@@ -559,8 +557,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, | |||
559 | /* Don't panic here, we expect map_sg users | 557 | /* Don't panic here, we expect map_sg users |
560 | to do proper error handling. */ | 558 | to do proper error handling. */ |
561 | attrs |= DMA_ATTR_SKIP_CPU_SYNC; | 559 | attrs |= DMA_ATTR_SKIP_CPU_SYNC; |
562 | xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir, | 560 | xen_swiotlb_unmap_sg(hwdev, sgl, i, dir, attrs); |
563 | attrs); | ||
564 | sg_dma_len(sgl) = 0; | 561 | sg_dma_len(sgl) = 0; |
565 | return 0; | 562 | return 0; |
566 | } | 563 | } |
@@ -687,8 +684,8 @@ const struct dma_map_ops xen_swiotlb_dma_ops = { | |||
687 | .sync_single_for_device = xen_swiotlb_sync_single_for_device, | 684 | .sync_single_for_device = xen_swiotlb_sync_single_for_device, |
688 | .sync_sg_for_cpu = xen_swiotlb_sync_sg_for_cpu, | 685 | .sync_sg_for_cpu = xen_swiotlb_sync_sg_for_cpu, |
689 | .sync_sg_for_device = xen_swiotlb_sync_sg_for_device, | 686 | .sync_sg_for_device = xen_swiotlb_sync_sg_for_device, |
690 | .map_sg = xen_swiotlb_map_sg_attrs, | 687 | .map_sg = xen_swiotlb_map_sg, |
691 | .unmap_sg = xen_swiotlb_unmap_sg_attrs, | 688 | .unmap_sg = xen_swiotlb_unmap_sg, |
692 | .map_page = xen_swiotlb_map_page, | 689 | .map_page = xen_swiotlb_map_page, |
693 | .unmap_page = xen_swiotlb_unmap_page, | 690 | .unmap_page = xen_swiotlb_unmap_page, |
694 | .dma_supported = xen_swiotlb_dma_supported, | 691 | .dma_supported = xen_swiotlb_dma_supported, |