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

Commit 82b12e23 authored by Robert P. J. Day's avatar Robert P. J. Day Committed by Linus Torvalds
Browse files

FRV: move DMA macros to scatterlist.h for consistency. 



To be consistent with other architectures, these two DMA macros should
be defined in scatterlist.h as opposed to dma-mapping.h

Signed-off-by: default avatarRobert P. J. Day <rpjday@crashcourse.ca>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7038220a

include/asm-frv/dma-mapping.h

+0 −10
Original line number Diff line number Diff line
@@ -16,16 +16,6 @@ extern unsigned long __nongprelbss dma_coherent_mem_end; 
void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp);

void dma_free_coherent(struct device *dev, size_t size, void *vaddr, dma_addr_t dma_handle);



/*

 * 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)



/*

 * Map a single buffer of the indicated size for DMA in streaming mode.

 * The 32-bit bus address to use is returned.

include/asm-frv/scatterlist.h

+10 −0
Original line number Diff line number Diff line
@@ -31,6 +31,16 @@ struct scatterlist { 
	unsigned int	length;

};



/*

 * 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)



#define ISA_DMA_THRESHOLD (0xffffffffUL)



#endif /* !_ASM_SCATTERLIST_H */