Commit c543a373 authored by Henrik Kretzschmar's avatar Henrik Kretzschmar Committed by James Bottomley
Browse files

[SCSI] Scsi_Cmnd conversion in psi240i driver 



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

Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 0b3a82d3

drivers/scsi/psi240i.c

+18 −13
Original line number Diff line number Diff line
@@ -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;
@@ -256,7 +256,7 @@ 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;

	struct scsi_cmnd *SCpnt;

	UCHAR status;

	int z;
@@ -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 *))

	{

	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

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



	SCpnt->scsi_done = done;

	padapter->ide.ide.ides.spigot = pdev->spigot;

drivers/scsi/psi240i.h

+3 −3
Original line number Diff line number Diff line
@@ -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