Subject: [PATCH] Sun 3x ESP: Scsi_Cmnd -> struct scsi_cmnd

Sun 3x ESP SCSI: Replace Scsi_Cmnd by struct scsi_cmnd

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

---
 drivers/scsi/sun3x_esp.c |   26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

--- linux-m68k-2.6.19.orig/drivers/scsi/sun3x_esp.c
+++ linux-m68k-2.6.19/drivers/scsi/sun3x_esp.c
@@ -25,7 +25,7 @@
 
 static void dma_barrier(struct NCR_ESP *esp);
 static int  dma_bytes_sent(struct NCR_ESP *esp, int fifo_count);
-static int  dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp);
+static int  dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp);
 static void dma_drain(struct NCR_ESP *esp);
 static void dma_invalidate(struct NCR_ESP *esp);
 static void dma_dump_state(struct NCR_ESP *esp);
@@ -38,11 +38,13 @@ static void dma_poll(struct NCR_ESP *esp
 static int  dma_ports_p(struct NCR_ESP *esp);
 static void dma_reset(struct NCR_ESP *esp);
 static void dma_setup(struct NCR_ESP *esp, __u32 addr, int count, int write);
-static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp);
-static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp);
-static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp);
-static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp);
-static void dma_advance_sg (Scsi_Cmnd *sp);
+static void dma_mmu_get_scsi_one(struct NCR_ESP *esp, struct scsi_cmnd *sp);
+static void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, struct scsi_cmnd *sp);
+static void dma_mmu_release_scsi_one(struct NCR_ESP *esp,
+				     struct scsi_cmnd *sp);
+static void dma_mmu_release_scsi_sgl(struct NCR_ESP *esp,
+				     struct scsi_cmnd *sp);
+static void dma_advance_sg(struct scsi_cmnd *sp);
 
 /* Detecting ESP chips on the machine.  This is the simple and easy
  * version.
@@ -174,7 +176,7 @@ static int dma_bytes_sent(struct NCR_ESP
 	return rval - fifo_count;
 }
 
-static int dma_can_transfer(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static int dma_can_transfer(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
 	return sp->SCp.this_residual;
 }
@@ -319,14 +321,14 @@ static void dma_setup(struct NCR_ESP *es
 	dregs->st_addr = addr;
 }
 
-static void dma_mmu_get_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static void dma_mmu_get_scsi_one(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
     sp->SCp.have_data_in = dvma_map((unsigned long)sp->SCp.buffer,
 				       sp->SCp.this_residual);
     sp->SCp.ptr = (char *)((unsigned long)sp->SCp.have_data_in);
 }
 
-static void dma_mmu_get_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static void dma_mmu_get_scsi_sgl(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
     int sz = sp->SCp.buffers_residual;
     struct scatterlist *sg = sp->SCp.buffer;
@@ -339,12 +341,12 @@ static void dma_mmu_get_scsi_sgl (struct
     sp->SCp.ptr=(char *)((unsigned long)sp->SCp.buffer->dma_address);
 }
 
-static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static void dma_mmu_release_scsi_one (struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
     dvma_unmap((char *)sp->SCp.have_data_in);
 }
 
-static void dma_mmu_release_scsi_sgl (struct NCR_ESP *esp, Scsi_Cmnd *sp)
+static void dma_mmu_release_scsi_sgl(struct NCR_ESP *esp, struct scsi_cmnd *sp)
 {
     int sz = sp->use_sg - 1;
     struct scatterlist *sg = (struct scatterlist *)sp->request_buffer;
@@ -355,7 +357,7 @@ static void dma_mmu_release_scsi_sgl (st
     }
 }
 
-static void dma_advance_sg (Scsi_Cmnd *sp)
+static void dma_advance_sg(struct scsi_cmnd *sp)
 {
     sp->SCp.ptr = (char *)((unsigned long)sp->SCp.buffer->dma_address);
 }