Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 634bf4f69b925950ddb09ef99ad7516a449a4333

Authored by Paul Mundt
1 parent 24ab54cb49
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 2 changed files with 9 additions and 9 deletions Side-by-side Diff

include/asm-sh/pci.h
Diff comments   View file @ 634bf4f
... ... @@ -87,15 +87,6 @@
87 87 */
88 88 #define pci_dac_dma_supported(pci_dev, mask) (0)
89 89  
90   -/* These macros should be used after a pci_map_sg call has been done
91   - * to get bus addresses of each of the SG entries and their lengths.
92   - * You should only work with the number of sg entries pci_map_sg
93   - * returns, or alternatively stop on the first sg_dma_len(sg) which
94   - * is 0.
95   - */
96   -#define sg_dma_address(sg) (virt_to_bus((sg)->dma_address))
97   -#define sg_dma_len(sg) ((sg)->length)
98   -
99 90 #ifdef CONFIG_PCI
100 91 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
101 92 enum pci_dma_burst_strategy *strat,
include/asm-sh/scatterlist.h
Diff comments   View file @ 634bf4f
... ... @@ -10,5 +10,14 @@
10 10  
11 11 #define ISA_DMA_THRESHOLD (0x1fffffff)
12 12  
  13 +/* These macros should be used after a pci_map_sg call has been done
  14 + * to get bus addresses of each of the SG entries and their lengths.
  15 + * You should only work with the number of sg entries pci_map_sg
  16 + * returns, or alternatively stop on the first sg_dma_len(sg) which
  17 + * is 0.
  18 + */
  19 +#define sg_dma_address(sg) ((sg)->dma_address)
  20 +#define sg_dma_len(sg) ((sg)->length)
  21 +
13 22 #endif /* !(__ASM_SH_SCATTERLIST_H) */