diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 14:48:09 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 14:48:09 +0900 |
| commit | 634bf4f69b925950ddb09ef99ad7516a449a4333 (patch) | |
| tree | 2a43f2602bf06c7e4430452bcd9f5bc4ab851532 | |
| parent | 24ab54cb49c099d691c68fdd1ac6a0c2f5177da4 (diff) | |
sh: Fix libata build.
Drop virt_to_bus() from sg_dma_address() so libata builds.
While we're at it, move sg_dma_address() and sg_dma_len()
from pci.h to scatterlist.h.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | include/asm-sh/pci.h | 9 | ||||
| -rw-r--r-- | include/asm-sh/scatterlist.h | 9 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/asm-sh/pci.h b/include/asm-sh/pci.h index 0a523c85b11..18a109de0f2 100644 --- a/include/asm-sh/pci.h +++ b/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/include/asm-sh/scatterlist.h b/include/asm-sh/scatterlist.h index 7b91df14002..d19e7cd3b02 100644 --- a/include/asm-sh/scatterlist.h +++ b/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) */ |