[PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[Robert P. J. Day]

To be consistent with other architectures, these two DMA macros should
be defined in scatterlist.h as opposed to dma-mapping.h

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

---

 include/asm-frv/dma-mapping.h |   10 ----------
 include/asm-frv/scatterlist.h |   10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/asm-frv/dma-mapping.h b/include/asm-frv/dma-mapping.h
index bcb2df6..2e8966c 100644
--- a/include/asm-frv/dma-mapping.h
+++ b/include/asm-frv/dma-mapping.h
@@ -17,16 +17,6 @@ void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle
 void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);

 /*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)	((sg)->dma_address)
-#define sg_dma_len(sg)		((sg)->length)
-
-/*
  * Map a single buffer of the indicated size for DMA in streaming mode.
  * The 32-bit bus address to use is returned.
  *
diff --git a/include/asm-frv/scatterlist.h b/include/asm-frv/scatterlist.h
index 2e7143b..4bca8a2 100644
--- a/include/asm-frv/scatterlist.h
+++ b/include/asm-frv/scatterlist.h
@@ -31,6 +31,16 @@ struct scatterlist {
 	unsigned int	length;
 };

+/*
+ * These macros should be used after a pci_map_sg call has been done
+ * to get bus addresses of each of the SG entries and their lengths.
+ * You should only work with the number of sg entries pci_map_sg
+ * returns, or alternatively stop on the first sg_dma_len(sg) which
+ * is 0.
+ */
+#define sg_dma_address(sg)	((sg)->dma_address)
+#define sg_dma_len(sg)		((sg)->length)
+
 #define ISA_DMA_THRESHOLD (0xffffffffUL)

 #endif /* !_ASM_SCATTERLIST_H */
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================

Re: [PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[David Howells]

Robert P. J. Day <rpjday@crashcourse.ca> wrote:

> To be consistent with other architectures, these two DMA macros should
> be defined in scatterlist.h as opposed to dma-mapping.h
> 
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>

Acked-by: David Howells <dhowells@redhat.com>

[PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[Robert P. J. Day]

To be consistent with other architectures, these two DMA macros should
be defined in scatterlist.h as opposed to dma-mapping.h

Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

---

  if david prefers to handle this because he wants to do something
differently, that's cool.

  not compile-tested as it looks fairly trivial, but i've said *that*
before.


diff --git a/include/asm-frv/dma-mapping.h b/include/asm-frv/dma-mapping.h
index bcb2df6..2e8966c 100644
--- a/include/asm-frv/dma-mapping.h
+++ b/include/asm-frv/dma-mapping.h
@@ -17,16 +17,6 @@ void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle
 void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);

 /*
- * These macros should be used after a pci_map_sg call has been done
- * to get bus addresses of each of the SG entries and their lengths.
- * You should only work with the number of sg entries pci_map_sg
- * returns, or alternatively stop on the first sg_dma_len(sg) which
- * is 0.
- */
-#define sg_dma_address(sg)	((sg)->dma_address)
-#define sg_dma_len(sg)		((sg)->length)
-
-/*
  * Map a single buffer of the indicated size for DMA in streaming mode.
  * The 32-bit bus address to use is returned.
  *
diff --git a/include/asm-frv/scatterlist.h b/include/asm-frv/scatterlist.h
index 2e7143b..c0c2da0 100644
--- a/include/asm-frv/scatterlist.h
+++ b/include/asm-frv/scatterlist.h
@@ -31,6 +31,9 @@ struct scatterlist {
 	unsigned int	length;
 };

+#define sg_dma_address(sg)	((sg)->dma_address)
+#define sg_dma_len(sg)		((sg)->length)
+
 #define ISA_DMA_THRESHOLD (0xffffffffUL)

 #endif /* !_ASM_SCATTERLIST_H */
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================

Re: [PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[Robert P. J. Day]

On Mon, 29 Oct 2007, Robert P. J. Day wrote:

>
> To be consistent with other architectures, these two DMA macros should
> be defined in scatterlist.h as opposed to dma-mapping.h
>
> Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

whoops, just noticed that i hadn't updated my sig to reflect my new
"crashcourse.ca" domain name.  not a big deal, but if someone wants to
tweak that before applying, i wouldn't object.  sorry.

rday
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================

Re: [PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[David Howells]

Robert P. J. Day <rpjday@crashcourse.ca> wrote:

> To be consistent with other architectures, these two DMA macros should
> be defined in scatterlist.h as opposed to dma-mapping.h

Why have you discarded the comment?

David

Re: [PATCH] FRV: Move DMA macros to scatterlist.h for consistency.

[Robert P. J. Day]

On Mon, 29 Oct 2007, David Howells wrote:

> Robert P. J. Day <rpjday@crashcourse.ca> wrote:
>
> > To be consistent with other architectures, these two DMA macros should
> > be defined in scatterlist.h as opposed to dma-mapping.h
>
> Why have you discarded the comment?
>
> David

whoops, my mistake.  i'll resubmit and put it back in.

rday
-- 
========================================================================
Robert P. J. Day
Linux Consulting, Training and Annoying Kernel Pedantry
Waterloo, Ontario, CANADA

http://crashcourse.ca
========================================================================