Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 634bf4f6 authored by Paul Mundt's avatar Paul Mundt
Browse files

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: default avatarPaul Mundt <lethal@linux-sh.org>
parent 24ab54cb

include/asm-sh/pci.h

+0 −9
Original line number Diff line number Diff line
@@ -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,

include/asm-sh/scatterlist.h

+9 −0
Original line number Diff line number Diff line
@@ -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) */