m68k: sg fallout

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Jens Axboe <axboe@carl.home.kernel.dk>

2 files changed, 4 insertions, 5 deletions

diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c
index d1780980fb20..a9680b5e8ac6 100644
--- a/drivers/scsi/atari_NCR5380.c
+++ b/drivers/scsi/atari_NCR5380.c
@@ -477,10 +477,9 @@ static void merge_contiguous_buffers(Scsi_Cmnd *cmd)
 
         for (endaddr = virt_to_phys(cmd->SCp.ptr + cmd->SCp.this_residual - 1) + 1;
              cmd->SCp.buffers_residual &&
-             virt_to_phys(page_address(cmd->SCp.buffer[1].page) +
-                          cmd->SCp.buffer[1].offset) == endaddr;) {
+             virt_to_phys(sg_virt(&cmd->SCp.buffer[1])) == endaddr;) {
                 MER_PRINTK("VTOP(%p) == %08lx -> merging\n",
-                           page_address(cmd->SCp.buffer[1].page), endaddr);
+                           page_address(sg_page(&cmd->SCp.buffer[1])), endaddr);
 #if (NDEBUG & NDEBUG_MERGING)
                 ++cnt;
 #endif
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c
index 80fb3f88af2e..1bc41907a038 100644
--- a/drivers/scsi/sun3x_esp.c
+++ b/drivers/scsi/sun3x_esp.c
@@ -332,8 +332,8 @@ static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
     struct scatterlist *sg = sp->SCp.buffer;
 
     while (sz >= 0) {
-            sg[sz].dma_address = dvma_map((unsigned long)page_address(sg[sz].page) +
-                                           sg[sz].offset, sg[sz].length);
+            sg[sz].dma_address = dvma_map((unsigned long)sg_virt(&sg[sz]),
+                                          sg[sz].length);
             sz--;
     }
     sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);