iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] Scsi_Cmnd conversion in psi240i driver

Browse Source 
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>
This commit is contained in:
Henrik Kretzschmar 2006-10-10 14:41:45 -07:00 committed by James Bottomley
parent 0b3a82d391
commit c543a3739c
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/scsi/psi240i.c
View File

@ -87,11 +87,11 @@ typedef struct
{ {
USHORT ports[13]; USHORT ports[13];
OUR_DEVICE device[8]; OUR_DEVICE device[8];
Scsi_Cmnd *pSCmnd; struct scsi_cmnd *pSCmnd;
IDE_STRUCT ide; IDE_STRUCT ide;
ULONG startSector; ULONG startSector;
USHORT sectorCount; USHORT sectorCount;
Scsi_Cmnd *SCpnt; struct scsi_cmnd *SCpnt;
VOID *buffer; VOID *buffer;
USHORT expectingIRQ; USHORT expectingIRQ;
} ADAPTER240I, *PADAPTER240I; } ADAPTER240I, *PADAPTER240I;
@ -253,12 +253,12 @@ static ULONG DecodeError (struct Scsi_Host *pshost, UCHAR status)
****************************************************************/ ****************************************************************/
static void Irq_Handler (int irq, void *dev_id) static void Irq_Handler (int irq, void *dev_id)
{ {
struct Scsi_Host *shost; // Pointer to host data block struct Scsi_Host *shost; // Pointer to host data block
PADAPTER240I padapter; // Pointer to adapter control structure PADAPTER240I padapter; // Pointer to adapter control structure
USHORT *pports; // I/O port array USHORT *pports; // I/O port array
Scsi_Cmnd *SCpnt; struct scsi_cmnd *SCpnt;
UCHAR status; UCHAR status;
int z; int z;
DEB(printk ("\npsi240i received interrupt\n")); DEB(printk ("\npsi240i received interrupt\n"));
@ -389,12 +389,17 @@ static irqreturn_t do_Irq_Handler (int irq, void *dev_id)
* Returns: Status code. * 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 UCHAR *cdb = (UCHAR *)SCpnt->cmnd;
PADAPTER240I padapter = HOSTDATA (SCpnt->device->host); // Pointer to adapter control structure // Pointer to SCSI CDB
POUR_DEVICE pdev = &padapter->device [SCpnt->device->id];// Pointer to device information PADAPTER240I padapter = HOSTDATA (SCpnt->device->host);
UCHAR rc; // command return code // 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; SCpnt->scsi_done = done;
padapter->ide.ide.ides.spigot = pdev->spigot; padapter->ide.ide.ides.spigot = pdev->spigot;

6
drivers/scsi/psi240i.h
View File

@ -309,7 +309,7 @@ typedef struct _IDENTIFY_DATA2 {
#endif // PSI_EIDE_SCSIOP #endif // PSI_EIDE_SCSIOP
// function prototypes // function prototypes
int Psi240i_Command (Scsi_Cmnd *SCpnt); int Psi240i_Command(struct scsi_cmnd *SCpnt);
int Psi240i_Abort (Scsi_Cmnd *SCpnt); int Psi240i_Abort(struct scsi_cmnd *SCpnt);
int Psi240i_Reset (Scsi_Cmnd *SCpnt, unsigned int flags); int Psi240i_Reset(struct scsi_cmnd *SCpnt, unsigned int flags);
#endif #endif