1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c
index 2597209183d0..eeddbd19eba5 100644
--- a/drivers/scsi/NCR5380.c
+++ b/drivers/scsi/NCR5380.c
@@ -295,16 +295,16 @@ static __inline__ void initialize_SCp(Scsi_Cmnd * cmd)
          * various queues are valid.
          */
 
-        if (cmd->use_sg) {
-                cmd->SCp.buffer = (struct scatterlist *) cmd->request_buffer;
-                cmd->SCp.buffers_residual = cmd->use_sg - 1;
+        if (scsi_bufflen(cmd)) {
+                cmd->SCp.buffer = scsi_sglist(cmd);
+                cmd->SCp.buffers_residual = scsi_sg_count(cmd) - 1;
                 cmd->SCp.ptr = sg_virt(cmd->SCp.buffer);
                 cmd->SCp.this_residual = cmd->SCp.buffer->length;
         } else {
                 cmd->SCp.buffer = NULL;
                 cmd->SCp.buffers_residual = 0;
-                cmd->SCp.ptr = (char *) cmd->request_buffer;
-                cmd->SCp.this_residual = cmd->request_bufflen;
+                cmd->SCp.ptr = NULL;
+                cmd->SCp.this_residual = 0;
         }
 }
 
@@ -932,7 +932,7 @@ static int __devinit NCR5380_init(struct Scsi_Host *instance, int flags)
  *      @instance: adapter to remove
  */
 
-static void __devexit NCR5380_exit(struct Scsi_Host *instance)
+static void NCR5380_exit(struct Scsi_Host *instance)
 {
         struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
 
@@ -975,14 +975,14 @@ static int NCR5380_queue_command(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))
                 case WRITE_6:
                 case WRITE_10:
                         hostdata->time_write[cmd->device->id] -= (jiffies - hostdata->timebase);
-                        hostdata->bytes_write[cmd->device->id] += cmd->request_bufflen;
+                        hostdata->bytes_write[cmd->device->id] += scsi_bufflen(cmd);
                         hostdata->pendingw++;
                         break;
                 case READ:
                 case READ_6:
                 case READ_10:
                         hostdata->time_read[cmd->device->id] -= (jiffies - hostdata->timebase);
-                        hostdata->bytes_read[cmd->device->id] += cmd->request_bufflen;
+                        hostdata->bytes_read[cmd->device->id] += scsi_bufflen(cmd);
                         hostdata->pendingr++;
                         break;
         }
@@ -1157,16 +1157,17 @@ static void NCR5380_main(struct work_struct *work)
  *      Locks: takes the needed instance locks
  */
 
-static irqreturn_t NCR5380_intr(int irq, void *dev_id) 
+static irqreturn_t NCR5380_intr(int dummy, void *dev_id)
 {
         NCR5380_local_declare();
-        struct Scsi_Host *instance = (struct Scsi_Host *)dev_id;
+        struct Scsi_Host *instance = dev_id;
         struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;
         int done;
         unsigned char basr;
         unsigned long flags;
 
-        dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n", irq));
+        dprintk(NDEBUG_INTR, ("scsi : NCR5380 irq %d triggered\n",
+                instance->irq));
 
         do {
                 done = 1;