Patchwork [2/2] powerpc: Remove map_/unmap_single() from dma_mapping_ops

login
register
mail settings
Submitter Mark Nelson
Date Oct. 28, 2008, 6:38 a.m.
Message ID <200810281738.14104.markn@au1.ibm.com>
Download mbox | patch
Permalink /patch/6052/
State Accepted
Commit c73049f6aa58ac1d1a9ca8cb2b415ef97240b2d3
Delegated to: Paul Mackerras
Headers show

Comments

Mark Nelson - Oct. 28, 2008, 6:38 a.m.
Now that all of the remaining dma_mapping_ops have had their map_/unmap_single
functions updated to become map/unmap_page functions, there is no need to have
the map_/unmap_single function pointers in the dma_mapping_ops.

So, take this opportunity to remove them and also remove the code that does
the checking for which set of functions to use.

Signed-off-by: Mark Nelson <markn@au1.ibm.com>
---
This is just a cleanup so can wait for 2.6.29

 arch/powerpc/include/asm/dma-mapping.h |   36 ++++-----------------------------
 1 file changed, 5 insertions(+), 31 deletions(-)
Becky Bruce - Oct. 28, 2008, 6:17 p.m.
| 
| Now that all of the remaining dma_mapping_ops have had their
| map_/unmap_single
| functions updated to become map/unmap_page functions, there is no need
| to have
| the map_/unmap_single function pointers in the dma_mapping_ops.
| 
| So, take this opportunity to remove them and also remove the code that
| does
| the checking for which set of functions to use.
| 
| Signed-off-by: Mark Nelson <markn@au1.ibm.com>

LGTM; test-built and booted an 8641 to double check.  I'm glad to see
the hackery removed. 

Acked-by: Becky Bruce <becky.bruce@freescale.com>

Cheers,
-Becky

Patch

Index: upstream/arch/powerpc/include/asm/dma-mapping.h
===================================================================
--- upstream.orig/arch/powerpc/include/asm/dma-mapping.h
+++ upstream/arch/powerpc/include/asm/dma-mapping.h
@@ -60,12 +60,6 @@  struct dma_mapping_ops {
 				dma_addr_t *dma_handle, gfp_t flag);
 	void		(*free_coherent)(struct device *dev, size_t size,
 				void *vaddr, dma_addr_t dma_handle);
-	dma_addr_t	(*map_single)(struct device *dev, void *ptr,
-				size_t size, enum dma_data_direction direction,
-				struct dma_attrs *attrs);
-	void		(*unmap_single)(struct device *dev, dma_addr_t dma_addr,
-				size_t size, enum dma_data_direction direction,
-				struct dma_attrs *attrs);
 	int		(*map_sg)(struct device *dev, struct scatterlist *sg,
 				int nents, enum dma_data_direction direction,
 				struct dma_attrs *attrs);
@@ -149,10 +143,9 @@  static inline int dma_set_mask(struct de
 }
 
 /*
- * TODO: map_/unmap_single will ideally go away, to be completely
- * replaced by map/unmap_page.   Until then, we allow dma_ops to have
- * one or the other, or both by checking to see if the specific
- * function requested exists; and if not, falling back on the other set.
+ * map_/unmap_single actually call through to map/unmap_page now that all the
+ * dma_mapping_ops have been converted over. We just have to get the page and
+ * offset to pass through to map_page
  */
 static inline dma_addr_t dma_map_single_attrs(struct device *dev,
 					      void *cpu_addr,
@@ -164,10 +157,6 @@  static inline dma_addr_t dma_map_single_
 
 	BUG_ON(!dma_ops);
 
-	if (dma_ops->map_single)
-		return dma_ops->map_single(dev, cpu_addr, size, direction,
-					   attrs);
-
 	return dma_ops->map_page(dev, virt_to_page(cpu_addr),
 				 (unsigned long)cpu_addr % PAGE_SIZE, size,
 				 direction, attrs);
@@ -183,11 +172,6 @@  static inline void dma_unmap_single_attr
 
 	BUG_ON(!dma_ops);
 
-	if (dma_ops->unmap_single) {
-		dma_ops->unmap_single(dev, dma_addr, size, direction, attrs);
-		return;
-	}
-
 	dma_ops->unmap_page(dev, dma_addr, size, direction, attrs);
 }
 
@@ -201,12 +185,7 @@  static inline dma_addr_t dma_map_page_at
 
 	BUG_ON(!dma_ops);
 
-	if (dma_ops->map_page)
-		return dma_ops->map_page(dev, page, offset, size, direction,
-					 attrs);
-
-	return dma_ops->map_single(dev, page_address(page) + offset, size,
-				   direction, attrs);
+	return dma_ops->map_page(dev, page, offset, size, direction, attrs);
 }
 
 static inline void dma_unmap_page_attrs(struct device *dev,
@@ -219,12 +198,7 @@  static inline void dma_unmap_page_attrs(
 
 	BUG_ON(!dma_ops);
 
-	if (dma_ops->unmap_page) {
-		dma_ops->unmap_page(dev, dma_address, size, direction, attrs);
-		return;
-	}
-
-	dma_ops->unmap_single(dev, dma_address, size, direction, attrs);
+	dma_ops->unmap_page(dev, dma_address, size, direction, attrs);
 }
 
 static inline int dma_map_sg_attrs(struct device *dev, struct scatterlist *sg,