Selaa lähdekoodia

[IA64] Move sg_dma_{len,address} from pci.h to scatterlist.h

IA64 is in a tiny minority providing these defines in pci.h.
Almost everyone else has them in scatterlist.h

Signed-off-by: Tony Luck <tony.luck@intel.com>
Tony Luck 18 vuotta sitten
vanhempi
commit
7806ca89bc
2 muutettua tiedostoa jossa 3 lisäystä ja 3 poistoa
  1. 0 3
      include/asm-ia64/pci.h
  2. 3 0
      include/asm-ia64/scatterlist.h

+ 0 - 3
include/asm-ia64/pci.h

@@ -78,9 +78,6 @@ pcibios_penalize_isa_irq (int irq, int active)
 #define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir)	do { } while (0)
 #define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir)	do { } while (0)
 #define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir)	do { mb(); } while (0)
 #define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir)	do { mb(); } while (0)
 
 
-#define sg_dma_len(sg)		((sg)->dma_length)
-#define sg_dma_address(sg)	((sg)->dma_address)
-
 #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,

+ 3 - 0
include/asm-ia64/scatterlist.h

@@ -25,4 +25,7 @@ struct scatterlist {
  */
  */
 #define ISA_DMA_THRESHOLD	0xffffffff
 #define ISA_DMA_THRESHOLD	0xffffffff
 
 
+#define sg_dma_len(sg)		((sg)->dma_length)
+#define sg_dma_address(sg)	((sg)->dma_address)
+
 #endif /* _ASM_IA64_SCATTERLIST_H */
 #endif /* _ASM_IA64_SCATTERLIST_H */