aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sun3x_esp.c
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-06-25 08:46:56 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:00:56 -0400
commitb035c96b2da7258bb2bba31812b5f9dda3499f00 (patch)
tree46c6b4d3ca2351392d12658342e352cb8df0beb3 /drivers/scsi/sun3x_esp.c
parent3921ee21e01ac5faecda640daa6071dc8f0e29c9 (diff)
[PATCH] m68k: Add the generic dma API functions
Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/sun3x_esp.c')
-rw-r--r--drivers/scsi/sun3x_esp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index cc990bed9683..2e2c1eb15636 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -332,11 +332,11 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
332 struct scatterlist *sg = sp->SCp.buffer; 332 struct scatterlist *sg = sp->SCp.buffer;
333 333
334 while (sz >= 0) { 334 while (sz >= 0) {
335 sg[sz].dvma_address = dvma_map((unsigned long)page_address(sg[sz].page) + 335 sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
336 sg[sz].offset, sg[sz].length); 336 sg[sz].offset, sg[sz].length);
337 sz--; 337 sz--;
338 } 338 }
339 sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dvma_address); 339 sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);
340} 340}
341 341
342static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp) 342static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
@@ -350,14 +350,14 @@ static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
350 struct scatterlist *sg = (struct scatterlist *)sp->buffer; 350 struct scatterlist *sg = (struct scatterlist *)sp->buffer;
351 351
352 while(sz >= 0) { 352 while(sz >= 0) {
353 dvma_unmap((char *)sg[sz].dvma_address); 353 dvma_unmap((char *)sg[sz].dma_address);
354 sz--; 354 sz--;
355 } 355 }
356} 356}
357 357
358static void dma_advance_sg (Scsi_Cmnd *sp) 358static void dma_advance_sg (Scsi_Cmnd *sp)
359{ 359{
360 sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address); 360 sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address);
361} 361}
362 362
363static int sun3x_esp_release(struct Scsi_Host *instance) 363static int sun3x_esp_release(struct Scsi_Host *instance)