Эх сурвалжийг харах

sh64: Move DMA macros from pci.h to scatterlist.h.

In order to be more consistent with other architectures, move two
DMA-related scatterlist macros from pci.h to scatterlist.h.

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Robert P. J. Day 17 жил өмнө
parent
commit
cbd627a449

+ 0 - 9
include/asm-sh64/pci.h

@@ -72,15 +72,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 #define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)
 #endif
 #endif
 
 
-/* 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)
-
 #ifdef CONFIG_PCI
 #ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
 					enum pci_dma_burst_strategy *strat,
 					enum pci_dma_burst_strategy *strat,

+ 9 - 0
include/asm-sh64/scatterlist.h

@@ -23,6 +23,15 @@ struct scatterlist {
     unsigned int length;
     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 (0xffffffff)
 #define ISA_DMA_THRESHOLD (0xffffffff)
 
 
 #endif /* !__ASM_SH64_SCATTERLIST_H */
 #endif /* !__ASM_SH64_SCATTERLIST_H */