[Xen-devel] [PATCH 1/4] swiotlb-xen: make instances match their method names

[Christoph Hellwig <hch@xxxxxx>]

Just drop two pointless _attrs prefixes to make the code a little
more grep-able.

Signed-off-by: Christoph Hellwig <hch@xxxxxx>
---
 drivers/xen/swiotlb-xen.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 877baf2a94f4..d4bc3aabd44d 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -504,9 +504,8 @@ xen_swiotlb_sync_single_for_device(struct device *hwdev, 
dma_addr_t dev_addr,
  * concerning calls here are the same as for swiotlb_unmap_page() above.
  */
 static void
-xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
-                          int nelems, enum dma_data_direction dir,
-                          unsigned long attrs)
+xen_swiotlb_unmap_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
+               enum dma_data_direction dir, unsigned long attrs)
 {
        struct scatterlist *sg;
        int i;
@@ -535,9 +534,8 @@ xen_swiotlb_unmap_sg_attrs(struct device *hwdev, struct 
scatterlist *sgl,
  * same here.
  */
 static int
-xen_swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl,
-                        int nelems, enum dma_data_direction dir,
-                        unsigned long attrs)
+xen_swiotlb_map_sg(struct device *hwdev, struct scatterlist *sgl, int nelems,
+               enum dma_data_direction dir, unsigned long attrs)
 {
        struct scatterlist *sg;
        int i;
@@ -562,8 +560,7 @@ xen_swiotlb_map_sg_attrs(struct device *hwdev, struct 
scatterlist *sgl,
                                /* Don't panic here, we expect map_sg users
                                   to do proper error handling. */
                                attrs |= DMA_ATTR_SKIP_CPU_SYNC;
-                               xen_swiotlb_unmap_sg_attrs(hwdev, sgl, i, dir,
-                                                          attrs);
+                               xen_swiotlb_unmap_sg(hwdev, sgl, i, dir, attrs);
                                sg_dma_len(sgl) = 0;
                                return 0;
                        }
@@ -690,8 +687,8 @@ const struct dma_map_ops xen_swiotlb_dma_ops = {
        .sync_single_for_device = xen_swiotlb_sync_single_for_device,
        .sync_sg_for_cpu = xen_swiotlb_sync_sg_for_cpu,
        .sync_sg_for_device = xen_swiotlb_sync_sg_for_device,
-       .map_sg = xen_swiotlb_map_sg_attrs,
-       .unmap_sg = xen_swiotlb_unmap_sg_attrs,
+       .map_sg = xen_swiotlb_map_sg,
+       .unmap_sg = xen_swiotlb_unmap_sg,
        .map_page = xen_swiotlb_map_page,
        .unmap_page = xen_swiotlb_unmap_page,
        .dma_supported = xen_swiotlb_dma_supported,
-- 
2.20.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel