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

[SCSI] Scsi_Cmnd conversion in qlogicfas408 driver 



Change obsolete Scsi_Cmnd to struct scsi_cmnd in the Qlocic FAS408 driver.

Signed-off-by: default avatarHenrik Kretzschmar <henne@nachtwindheim.de>

rejections fixed and
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 811c9366

drivers/scsi/qlogicfas408.c

+9 −9
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int ql_wai(struct qlogicfas408_priv *priv) 
 *	caller must hold host lock

 */



static void ql_icmd(Scsi_Cmnd * cmd)

static void ql_icmd(struct scsi_cmnd *cmd)

{

	struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);

	int 	qbase = priv->qbase;
@@ -256,7 +256,7 @@ static void ql_icmd(Scsi_Cmnd * cmd) 
 *	Process scsi command - usually after interrupt 

 */



static unsigned int ql_pcmd(Scsi_Cmnd * cmd)

static unsigned int ql_pcmd(struct scsi_cmnd *cmd)

{

	unsigned int i, j;

	unsigned long k;
@@ -407,7 +407,7 @@ static unsigned int ql_pcmd(Scsi_Cmnd * cmd) 


static void ql_ihandl(void *dev_id)

{

	Scsi_Cmnd *icmd;

	struct scsi_cmnd *icmd;

	struct Scsi_Host *host = dev_id;

	struct qlogicfas408_priv *priv = get_priv_by_host(host);

	int qbase = priv->qbase;
@@ -447,7 +447,8 @@ irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id) 
 *	Queued command

 */



int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *))

int qlogicfas408_queuecommand(struct scsi_cmnd *cmd,

			      void (*done) (struct scsi_cmnd *))

{

	struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);

	if (scmd_id(cmd) == priv->qinitid) {
@@ -470,8 +471,7 @@ int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *)) 
 *	Return bios parameters 

 */



int qlogicfas408_biosparam(struct scsi_device * disk,

		        struct block_device *dev,

int qlogicfas408_biosparam(struct scsi_device *disk, struct block_device *dev,

			   sector_t capacity, int ip[])

{

/* This should mimic the DOS Qlogic driver's behavior exactly */
@@ -494,7 +494,7 @@ int qlogicfas408_biosparam(struct scsi_device * disk, 
 *	Abort a command in progress

 */

 

int qlogicfas408_abort(Scsi_Cmnd * cmd)

int qlogicfas408_abort(struct scsi_cmnd *cmd)

{

	struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);

	priv->qabort = 1;
@@ -508,7 +508,7 @@ int qlogicfas408_abort(Scsi_Cmnd * cmd) 
 *	the PCMCIA qlogic_stub code. This wants fixing

 */



int qlogicfas408_bus_reset(Scsi_Cmnd * cmd)

int qlogicfas408_bus_reset(struct scsi_cmnd *cmd)

{

	struct qlogicfas408_priv *priv = get_priv_by_cmd(cmd);

	unsigned long flags;

drivers/scsi/qlogicfas408.h

+15 −14
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ struct qlogicfas408_priv { 
	int qlirq;		/* IRQ being used */

	int int_type;		/* type of irq, 2 for ISA board, 0 for PCMCIA */

	char qinfo[80];		/* description */

	 Scsi_Cmnd 	*qlcmd;		/* current command being processed */

	struct scsi_cmnd *qlcmd;	/* current command being processed */

	struct Scsi_Host *shost;	/* pointer back to host */

	struct qlogicfas408_priv *next; /* next private struct */

};
@@ -103,12 +103,13 @@ struct qlogicfas408_priv { 
#define get_priv_by_host(x) (struct qlogicfas408_priv *)&((x)->hostdata[0])



irqreturn_t qlogicfas408_ihandl(int irq, void *dev_id);

int qlogicfas408_queuecommand(Scsi_Cmnd * cmd, void (*done) (Scsi_Cmnd *));

int qlogicfas408_queuecommand(struct scsi_cmnd * cmd,

			      void (*done) (struct scsi_cmnd *));

int qlogicfas408_biosparam(struct scsi_device * disk,

			   struct block_device *dev,

			   sector_t capacity, int ip[]);

int qlogicfas408_abort(Scsi_Cmnd * cmd);

int qlogicfas408_bus_reset(Scsi_Cmnd * cmd);

int qlogicfas408_abort(struct scsi_cmnd * cmd);

int qlogicfas408_bus_reset(struct scsi_cmnd * cmd);

const char *qlogicfas408_info(struct Scsi_Host *host);

int qlogicfas408_get_chip_type(int qbase, int int_type);

void qlogicfas408_setup(int qbase, int id, int int_type);