linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / scsi / jazz_esp.c

diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index bfac444..fcd304e 100644 (file)
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -52,6 +52,7 @@ static volatile unsigned char cmd_buffer[16];
                                 * via PIO.
                                 */
 
+int jazz_esp_detect(struct scsi_host_template *tpnt);
 static int jazz_esp_release(struct Scsi_Host *shost)
 {
        if (shost->irq)
@@ -74,7 +75,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
      * first assumption it is there:-)
      */
     if (1) {
-       esp_dev = NULL;
+       esp_dev = 0;
        esp = esp_allocate(tpnt, (void *) esp_dev);
        
        /* Do command transfer with programmed I/O */
@@ -93,13 +94,13 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
        esp->dma_setup = &dma_setup;
 
        /* Optional functions */
-       esp->dma_barrier = NULL;
-       esp->dma_drain = NULL;
-       esp->dma_invalidate = NULL;
-       esp->dma_irq_entry = NULL;
-       esp->dma_irq_exit = NULL;
-       esp->dma_poll = NULL;
-       esp->dma_reset = NULL;
+       esp->dma_barrier = 0;
+       esp->dma_drain = 0;
+       esp->dma_invalidate = 0;
+       esp->dma_irq_entry = 0;
+       esp->dma_irq_exit = 0;
+       esp->dma_poll = 0;
+       esp->dma_reset = 0;
        esp->dma_led_off = &dma_led_off;
        esp->dma_led_on = &dma_led_on;
        
@@ -119,7 +120,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
         * of DMA channel, so we can use the jazz DMA functions
         * 
         */
-       esp->dregs = (void *) JAZZ_SCSI_DMA;
+       esp->dregs = JAZZ_SCSI_DMA;
        
        /* ESP register base */
        esp->eregs = (struct ESP_regs *)(JAZZ_SCSI_BASE);
@@ -131,7 +132,7 @@ static int jazz_esp_detect(struct scsi_host_template *tpnt)
        esp->esp_command_dvma = vdma_alloc(CPHYSADDR(cmd_buffer), sizeof (cmd_buffer));
        
        esp->irq = JAZZ_SCSI_IRQ;
-       request_irq(JAZZ_SCSI_IRQ, esp_intr, IRQF_DISABLED, "JAZZ SCSI",
+       request_irq(JAZZ_SCSI_IRQ, esp_intr, SA_INTERRUPT, "JAZZ SCSI",
                    esp->ehost);
 
        /*
@@ -257,7 +258,7 @@ 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)
 {
     int sz = sp->use_sg - 1;
-    struct scatterlist *sg = (struct scatterlist *)sp->request_buffer;
+    struct scatterlist *sg = (struct scatterlist *)sp->buffer;
                        
     while(sz >= 0) {
        vdma_free(sg[sz].dma_address);