]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[SCSI] dec_esp: Use the right address space macro
authorRalf Baechle <ralf@linux-mips.org>
Sat, 15 Oct 2005 01:44:26 +0000 (02:44 +0100)
committerJames Bottomley <jejb@mulgrave.(none)>
Fri, 28 Oct 2005 19:46:05 +0000 (14:46 -0500)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/dec_esp.c

index 90e2faf94a0931e0b7e7cc8ee1060d2d96a7ea83..2d7bde693d9616887d967b0751c43854500613bf 100644 (file)
@@ -516,14 +516,15 @@ static void dma_advance_sg(struct scsi_cmnd * sp)
 static void pmaz_dma_drain(struct NCR_ESP *esp)
 {
        memcpy(phys_to_virt(esp_virt_buffer),
-               (void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
-               scsi_current_length);
+              (void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM +
+                                 ESP_TGT_DMA_SIZE),
+              scsi_current_length);
 }
 
 static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length)
 {
        volatile u32 *dmareg =
-               (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
+               (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
 
        if (length > ESP_TGT_DMA_SIZE)
                length = ESP_TGT_DMA_SIZE;
@@ -539,9 +540,10 @@ static void pmaz_dma_init_read(struct NCR_ESP *esp, u32 vaddress, int length)
 static void pmaz_dma_init_write(struct NCR_ESP *esp, u32 vaddress, int length)
 {
        volatile u32 *dmareg =
-               (volatile u32 *)KSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
+               (volatile u32 *)CKSEG1ADDR(esp->slot + DEC_SCSI_DMAREG);
 
-       memcpy((void *)KSEG1ADDR(esp->slot + DEC_SCSI_SRAM + ESP_TGT_DMA_SIZE),
+       memcpy((void *)CKSEG1ADDR(esp->slot + DEC_SCSI_SRAM +
+                                 ESP_TGT_DMA_SIZE),
               phys_to_virt(vaddress), length);
 
        wmb();