Patchwork [V2,1/3] powerpc: Use sg->dma_length in sg_dma_len() macro on 32-bit

mail settings
Submitter Becky Bruce
Date May 14, 2009, 10:42 p.m.
Message ID <>
Download mbox | patch
Permalink /patch/27229/
State Accepted, archived
Delegated to: Benjamin Herrenschmidt
Headers show


Becky Bruce - May 14, 2009, 10:42 p.m.
Currently, the 32-bit code uses sg->length instead of sg->dma_lentgh
to report sg_dma_len.  However, since the default dma code for 32-bit
(the dma_direct case) sets dma_length and length to the same thing,
we should be able to use dma_length there as well.  This gets rid of
some 32-vs-64-bit ifdefs, and is needed by the swiotlb code which
actually distinguishes between dma_length and length.

Signed-off-by: Becky Bruce <>
 arch/powerpc/include/asm/scatterlist.h |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)


diff --git a/arch/powerpc/include/asm/scatterlist.h b/arch/powerpc/include/asm/scatterlist.h
index fcf7d55..912bf59 100644
--- a/arch/powerpc/include/asm/scatterlist.h
+++ b/arch/powerpc/include/asm/scatterlist.h
@@ -21,7 +21,7 @@  struct scatterlist {
 	unsigned int offset;
 	unsigned int length;
-	/* For TCE support */
+	/* For TCE or SWIOTLB support */
 	dma_addr_t dma_address;
 	u32 dma_length;
@@ -34,11 +34,7 @@  struct scatterlist {
  * is 0.
 #define sg_dma_address(sg)	((sg)->dma_address)
-#ifdef __powerpc64__
 #define sg_dma_len(sg)		((sg)->dma_length)
-#define sg_dma_len(sg)		((sg)->length)
 #ifdef __powerpc64__