patch-2.3.41 linux/drivers/scsi/esp.c

• Lines: 40
• Date: Thu Jan 27 08:58:15 2000
• Orig file: v2.3.40/linux/drivers/scsi/esp.c
• Orig date: Wed Dec 29 13:13:18 1999

diff -u --recursive --new-file v2.3.40/linux/drivers/scsi/esp.c linux/drivers/scsi/esp.c
@@ -791,7 +791,7 @@
 {
 	struct sbus_dev *sdev = esp->sdev;
 
-	esp->esp_command = sbus_alloc_consistant(sdev, 16,
+	esp->esp_command = sbus_alloc_consistent(sdev, 16,
 						 &esp->esp_command_dvma);
 	if (esp->esp_command == NULL ||
 	    esp->esp_command_dvma == 0)
@@ -1114,7 +1114,7 @@
 	return 0;
 
 fail_unmap_cmdarea:
-	sbus_free_consistant(esp->sdev, 16,
+	sbus_free_consistent(esp->sdev, 16,
 			     (void *) esp->esp_command,
 			     esp->esp_command_dvma);
 
@@ -1420,8 +1420,8 @@
 		sp->SCp.buffers_residual = sbus_map_sg(esp->sdev,
 						       sp->SCp.buffer,
 						       sp->use_sg);
-		sp->SCp.this_residual = sp->SCp.buffer->dvma_length;
-		sp->SCp.ptr = (char *) ((unsigned long)sp->SCp.buffer->dvma_address);
+		sp->SCp.this_residual = sg_dma_len(sp->SCp.buffer);
+		sp->SCp.ptr = (char *) ((unsigned long)sg_dma_address(sp->SCp.buffer));
 	}
 }
 
@@ -2537,8 +2537,8 @@
 {
 	++sp->SCp.buffer;
 	--sp->SCp.buffers_residual;
-	sp->SCp.this_residual = sp->SCp.buffer->dvma_length;
-	sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dvma_address);
+	sp->SCp.this_residual = sg_dma_len(sp->SCp.buffer);
+	sp->SCp.ptr = (char *)((unsigned long)sg_dma_address(sp->SCp.buffer));
 }
 
 /* Please note that the way I've coded these routines is that I _always_