[SCSI] Scsi_Cmnd conversion in psi240i driver

Changes the obsolete Scsi_Cmnd to struct scsi_cmnd in psi240i-driver.

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

diff --git a/drivers/scsi/psi240i.c b/drivers/scsi/psi240i.c
index a720c9265e6637c5cbc5b330ec1cf060a43e6b2a..ac0419e2714ae2df0edee98aa45a2915b84c08da 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;
@@ -253,12 +253,12 @@ static ULONG DecodeError (struct Scsi_Host *pshost, UCHAR status)
  ****************************************************************/
 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"));
 
@@ -389,12 +389,17 @@ static irqreturn_t do_Irq_Handler (int irq, void *dev_id)
  *     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;

diff --git a/drivers/scsi/psi240i.h b/drivers/scsi/psi240i.h
index 6a598766df51648de8185be4044c15d71056e710..21ebb9214004cfc1eed5112eadd0d7a8bf4710c2 100644 (file)
--- a/drivers/scsi/psi240i.h
+++ b/drivers/scsi/psi240i.h
@@ -309,7 +309,7 @@ typedef struct _IDENTIFY_DATA2 {
 #endif // PSI_EIDE_SCSIOP
 
 // function prototypes
-int Psi240i_Command                    (Scsi_Cmnd *SCpnt);
-int Psi240i_Abort                      (Scsi_Cmnd *SCpnt);
-int Psi240i_Reset                      (Scsi_Cmnd *SCpnt, unsigned int flags);
+int Psi240i_Command(struct scsi_cmnd *SCpnt);
+int Psi240i_Abort(struct scsi_cmnd *SCpnt);
+int Psi240i_Reset(struct scsi_cmnd *SCpnt, unsigned int flags);
 #endif