leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386 dma_map_sg: convert to using sg helpers

Browse Source 
The dma mapping helpers need to be converted to using
sg helpers as well, so they will work with a chained
sglist setup.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe 2007-05-09 09:15:27 +02:00
parent d3ad0aa424
commit a17b490420
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/asm-x86/dma-mapping_32.h
View File

@ -2,10 +2,10 @@
#define _ASM_I386_DMA_MAPPING_H #define _ASM_I386_DMA_MAPPING_H
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/scatterlist.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/scatterlist.h>
#include <asm/bug.h> #include <asm/bug.h>
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)
@ -35,18 +35,19 @@ dma_unmap_single(struct device *dev, dma_addr_t dma_addr, size_t size,
} }
static inline int static inline int
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
struct scatterlist *sg;
int i; int i;
BUG_ON(!valid_dma_direction(direction)); BUG_ON(!valid_dma_direction(direction));
WARN_ON(nents == 0 || sg[0].length == 0); WARN_ON(nents == 0 || sglist[0].length == 0);
for (i = 0; i < nents; i++ ) { for_each_sg(sglist, sg, nents, i) {
BUG_ON(!sg[i].page); BUG_ON(!sg->page);
sg[i].dma_address = page_to_phys(sg[i].page) + sg[i].offset; sg->dma_address = page_to_phys(sg->page) + sg->offset;
} }
flush_write_buffers(); flush_write_buffers();