fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c
index 76972b4..899e89d 100644 (file)
--- a/drivers/scsi/psi240i.c
+++ b/drivers/scsi/psi240i.c
@@ -87,11 +87,11 @@ typedef struct
        {
        USHORT           ports[13];
        OUR_DEVICE       device[8];
-       Scsi_Cmnd       *pSCmnd;
+       struct scsi_cmnd *pSCmnd;
        IDE_STRUCT       ide;
        ULONG            startSector;
        USHORT           sectorCount;
-       Scsi_Cmnd       *SCpnt;
+       struct scsi_cmnd *SCpnt;
        VOID            *buffer;
        USHORT           expectingIRQ;
        }       ADAPTER240I, *PADAPTER240I;
@@ -247,19 +247,18 @@ static ULONG DecodeError (struct Scsi_Host *pshost, UCHAR status)
  *
  *     Parameters:             irq             - Hardware IRQ number.
  *                                     dev_id  -
- *                                     regs    -
  *
  *     Returns:                TRUE if drive is not ready in time.
  *
  ****************************************************************/
-static void Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
+static void Irq_Handler (int irq, void *dev_id)
        {
-       struct Scsi_Host   *shost;                      // Pointer to host data block
-       PADAPTER240I            padapter;               // Pointer to adapter control structure
-       USHORT                     *pports;                     // I/O port array
-       Scsi_Cmnd                  *SCpnt;
-       UCHAR                           status;
-       int                                     z;
+       struct Scsi_Host *shost;        // Pointer to host data block
+       PADAPTER240I padapter;          // Pointer to adapter control structure
+       USHORT *pports;                 // I/O port array
+       struct scsi_cmnd *SCpnt;
+       UCHAR status;
+       int z;
 
        DEB(printk ("\npsi240i received interrupt\n"));
 
@@ -368,13 +367,13 @@ irqerror:;
        SCpnt->scsi_done (SCpnt);
        }
 
-static irqreturn_t do_Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t do_Irq_Handler (int irq, void *dev_id)
 {
        unsigned long flags;
        struct Scsi_Host *dev = dev_id;
        
        spin_lock_irqsave(dev->host_lock, flags);
-       Irq_Handler(irq, dev_id, regs);
+       Irq_Handler(irq, dev_id);
        spin_unlock_irqrestore(dev->host_lock, flags);
        return IRQ_HANDLED;
 }
@@ -390,12 +389,17 @@ static irqreturn_t do_Irq_Handler (int irq, void *dev_id, struct pt_regs *regs)
  *     Returns:                Status code.
  *
  ****************************************************************/
-static int Psi240i_QueueCommand (Scsi_Cmnd *SCpnt, void (*done)(Scsi_Cmnd *))
+static int Psi240i_QueueCommand(struct scsi_cmnd *SCpnt,
+                               void (*done)(struct scsi_cmnd *))
        {
-       UCHAR              *cdb = (UCHAR *)SCpnt->cmnd;                                 // Pointer to SCSI CDB
-       PADAPTER240I    padapter = HOSTDATA (SCpnt->device->host);                      // Pointer to adapter control structure
-       POUR_DEVICE             pdev     = &padapter->device [SCpnt->device->id];// Pointer to device information
-       UCHAR                   rc;                                                                                     // command return code
+       UCHAR *cdb = (UCHAR *)SCpnt->cmnd;
+       // Pointer to SCSI CDB
+       PADAPTER240I padapter = HOSTDATA (SCpnt->device->host);
+       // Pointer to adapter control structure
+       POUR_DEVICE pdev = &padapter->device [SCpnt->device->id];
+       // Pointer to device information
+       UCHAR rc;
+       // command return code
 
        SCpnt->scsi_done = done;
        padapter->ide.ide.ides.spigot = pdev->spigot;