From 09c6e36555a3e38d150a96eb51971ae2714dc1e6 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Wed, 27 Sep 2006 14:48:09 +0900 Subject: [PATCH] --- yaml --- r: 36251 b: refs/heads/master c: 634bf4f69b925950ddb09ef99ad7516a449a4333 h: refs/heads/master i: 36249: 0a9487ba1d13cf98edf7c9b20e82f78f2de117f7 36247: af00eb2d378cd534ccfb4570fa39050d3980144f v: v3 --- [refs] | 2 +- trunk/include/asm-sh/pci.h | 9 --------- trunk/include/asm-sh/scatterlist.h | 9 +++++++++ 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 5902ea3cb2c4..f040a3d59d4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24ab54cb49c099d691c68fdd1ac6a0c2f5177da4 +refs/heads/master: 634bf4f69b925950ddb09ef99ad7516a449a4333 diff --git a/trunk/include/asm-sh/pci.h b/trunk/include/asm-sh/pci.h index 0a523c85b11c..18a109de0f2e 100644 --- a/trunk/include/asm-sh/pci.h +++ b/trunk/include/asm-sh/pci.h @@ -87,15 +87,6 @@ static inline void pcibios_penalize_isa_irq(int irq, int active) */ #define pci_dac_dma_supported(pci_dev, mask) (0) -/* 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) (virt_to_bus((sg)->dma_address)) -#define sg_dma_len(sg) ((sg)->length) - #ifdef CONFIG_PCI static inline void pci_dma_burst_advice(struct pci_dev *pdev, enum pci_dma_burst_strategy *strat, diff --git a/trunk/include/asm-sh/scatterlist.h b/trunk/include/asm-sh/scatterlist.h index 7b91df140022..d19e7cd3b023 100644 --- a/trunk/include/asm-sh/scatterlist.h +++ b/trunk/include/asm-sh/scatterlist.h @@ -10,4 +10,13 @@ struct scatterlist { #define ISA_DMA_THRESHOLD (0x1fffffff) +/* 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) + #endif /* !(__ASM_SH_SCATTERLIST_H) */