Skip to contentSkip to conversation

dma-mapping: remove unused attrs parameter to dma_common_get_sgtable

PATCH In review Huaisheng Ye 2 participants 3 messages Jan 3, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma-mapping: remove unused attrs parameter to dma_common_get_sgtable

From: Huaisheng Ye <[email protected]>

dma_common_get_sgtable has parameter attrs which is not used at all. Remove it.

---
 drivers/xen/swiotlb-xen.c   | 2 +-
 include/linux/dma-mapping.h | 5 ++---
 kernel/dma/mapping.c        | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/xen/swiotlb-xen.c +1 -1
index 2a7f545..2dc17a5 100644
@@ -697,7 +697,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
 							   handle, size, attrs);
 	}
 #endif
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
 }
 
 static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr)
include/linux/dma-mapping.h +2 -3
index d327bdd..bbfad44 100644
@@ -483,7 +483,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 
 int
 dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
-		dma_addr_t dma_addr, size_t size, unsigned long attrs);
+		dma_addr_t dma_addr, size_t size);
 
 static inline int
 dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
@@ -495,8 +495,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 	if (ops->get_sgtable)
 		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
 					attrs);
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-			attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
 }
 
 #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
kernel/dma/mapping.c +1 -2
index 58dec7a..6b33f10 100644
@@ -202,8 +202,7 @@ void dmam_release_declared_memory(struct device *dev)
  * Create scatter-list for the already allocated DMA buffer.
  */
 int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
-		 void *cpu_addr, dma_addr_t dma_addr, size_t size,
-		 unsigned long attrs)
+		 void *cpu_addr, dma_addr_t dma_addr, size_t size)
 {
 	struct page *page;
 	int ret;
Signature · 1 line
1.8.3.1
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Huaisheng Ye

From: Huaisheng Ye <[email protected]>

dma_common_get_sgtable has parameter attrs which is not used at all. Remove it.

FYI the patch doesn't apply cleanly to master.

Quoted 60 lines
---
 drivers/xen/swiotlb-xen.c   | 2 +-
 include/linux/dma-mapping.h | 5 ++---
 kernel/dma/mapping.c        | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/xen/swiotlb-xen.c +1 -1
index 2a7f545..2dc17a5 100644
@@ -697,7 +697,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
 							   handle, size, attrs);
 	}
 #endif
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
 }
 
 static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr)
include/linux/dma-mapping.h +2 -3
index d327bdd..bbfad44 100644
@@ -483,7 +483,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 
 int
 dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
-		dma_addr_t dma_addr, size_t size, unsigned long attrs);
+		dma_addr_t dma_addr, size_t size);
 
 static inline int
 dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
@@ -495,8 +495,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 	if (ops->get_sgtable)
 		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
 					attrs);
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-			attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
 }
 
 #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
kernel/dma/mapping.c +1 -2
index 58dec7a..6b33f10 100644
@@ -202,8 +202,7 @@ void dmam_release_declared_memory(struct device *dev)
  * Create scatter-list for the already allocated DMA buffer.
  */
 int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
-		 void *cpu_addr, dma_addr_t dma_addr, size_t size,
-		 unsigned long attrs)
+		 void *cpu_addr, dma_addr_t dma_addr, size_t size)
 {
 	struct page *page;
 	int ret;
Signature · 1 line
1.8.3.1
maintainer Acked-by on v1 1/1
#2 lore raw
In reply to Huaisheng Ye
Quoted 6 lines · Huaisheng Ye

From: Huaisheng Ye <[email protected]>

dma_common_get_sgtable has parameter attrs which is not used at all. Remove it.

FYI the patch doesn't apply cleanly to master.

Quoted 60 lines
---
 drivers/xen/swiotlb-xen.c   | 2 +-
 include/linux/dma-mapping.h | 5 ++---
 kernel/dma/mapping.c        | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
drivers/xen/swiotlb-xen.c +1 -1
index 2a7f545..2dc17a5 100644
@@ -697,7 +697,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
 							   handle, size, attrs);
 	}
 #endif
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size, attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, handle, size);
 }
 
 static int xen_swiotlb_mapping_error(struct device *dev, dma_addr_t dma_addr)
include/linux/dma-mapping.h +2 -3
index d327bdd..bbfad44 100644
@@ -483,7 +483,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 
 int
 dma_common_get_sgtable(struct device *dev, struct sg_table *sgt, void *cpu_addr,
-		dma_addr_t dma_addr, size_t size, unsigned long attrs);
+		dma_addr_t dma_addr, size_t size);
 
 static inline int
 dma_get_sgtable_attrs(struct device *dev, struct sg_table *sgt, void *cpu_addr,
@@ -495,8 +495,7 @@ void *dma_common_pages_remap(struct page **pages, size_t size,
 	if (ops->get_sgtable)
 		return ops->get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
 					attrs);
-	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size,
-			attrs);
+	return dma_common_get_sgtable(dev, sgt, cpu_addr, dma_addr, size);
 }
 
 #define dma_get_sgtable(d, t, v, h, s) dma_get_sgtable_attrs(d, t, v, h, s, 0)
kernel/dma/mapping.c +1 -2
index 58dec7a..6b33f10 100644
@@ -202,8 +202,7 @@ void dmam_release_declared_memory(struct device *dev)
  * Create scatter-list for the already allocated DMA buffer.
  */
 int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
-		 void *cpu_addr, dma_addr_t dma_addr, size_t size,
-		 unsigned long attrs)
+		 void *cpu_addr, dma_addr_t dma_addr, size_t size)
 {
 	struct page *page;
 	int ret;
Signature · 1 line
1.8.3.1

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel